Merge branch 'development-0.4'
authorLuciano Montanaro <mikelima@cirulla.net>
Sun, 26 Jun 2011 15:51:11 +0000 (17:51 +0200)
committerLuciano Montanaro <mikelima@cirulla.net>
Sun, 26 Jun 2011 15:51:11 +0000 (17:51 +0200)

Trivial merge