Commit e2dd3ffbb403bd5611981404c3cdcf392deb34d1

Stefano Lattarini 2012-05-01T14:28:39

Merge branch 'maint' * maint: fixup: botched edit in bootstrap.sh