Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 1 May 2012 12:28:39 +0000 (14:28 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 1 May 2012 12:28:39 +0000 (14:28 +0200)
* maint:
  fixup: botched edit in bootstrap.sh


Trivial merge