Commit dada4b40410bf0a8d00d8b27facec2cd26c8aa39

Stefano Lattarini 2010-08-06T21:44:01

Merge branch 'maint' Conflicts: HACKING