Merge commit 'origin/master'
authorAlberto Mardegan <mardy@users.sourceforge.net>
Mon, 7 Sep 2009 17:13:50 +0000 (20:13 +0300)
committerAlberto Mardegan <mardy@users.sourceforge.net>
Mon, 7 Sep 2009 17:13:50 +0000 (20:13 +0300)

Trivial merge