Commit 0fc7e23fe9fb5fcebfb22ff56d5c64c9030b3dc3

Stefano Lattarini 2011-02-10T10:32:51

Merge branch 'maint'