Commit 3b0c8d59b79346861dd48242672b7aed7f863c9f

Stefano Lattarini 2011-04-23T00:02:23

Merge branch 'maint'