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)
commit1422011ebb1c41a4bb446de169027e211ad9a710
tree785cd3e0b921d9fd47649a5678edd38dfe4256ed
parent7033a08aeedb9d5b741283386f146f07d7b210b2
parentf8f3c6ea3c71351899c834c2d2a821ee20f62aaf
Merge branch 'upstream' into patches/010_makefile-destdir-support