Merge commit 'v2.5.1'
authorDinko Korunic <kreator@carnet.hr>
Thu, 24 Feb 2011 19:08:56 +0000 (20:08 +0100)
committerDinko Korunic <kreator@carnet.hr>
Thu, 24 Feb 2011 19:08:56 +0000 (20:08 +0100)

Trivial merge