Merge commit '0.10.2' into import
authorAlberto Mardegan <mardy@users.sourceforge.net>
Sat, 5 Sep 2009 12:26:59 +0000 (15:26 +0300)
committerAlberto Mardegan <mardy@users.sourceforge.net>
Sat, 5 Sep 2009 12:26:59 +0000 (15:26 +0300)

Trivial merge