Merge branch 'upstream' into patches/010_makefile-destdir-support
authorIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 18:55:12 +0000 (18:55 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 18:55:12 +0000 (18:55 +0000)

Trivial merge