Merge commit 'v3.1'
authorDragan Dosen <ddosen@ffzg.hr>
Fri, 22 Apr 2011 14:52:46 +0000 (16:52 +0200)
committerDragan Dosen <ddosen@ffzg.hr>
Fri, 22 Apr 2011 14:52:46 +0000 (16:52 +0200)

Trivial merge