Merge branch 'development-0.4' tags/0.3.6
authorLuciano Montanaro <mikelima@cirulla.net>
Sun, 26 Jun 2011 10:28:01 +0000 (12:28 +0200)
committerLuciano Montanaro <mikelima@cirulla.net>
Sun, 26 Jun 2011 10:28:01 +0000 (12:28 +0200)

Trivial merge