Commit d670e3bd35063300b358d218bd02dbf48e74fe04
2013-02-08T22:09:00
Merge remote-tracking branch 'origin/patches-2.0' This is an "ours" commit: I'm not taking the recent autotools changes from patches-2.0, since they'd conflict with master.