Merge remote-tracking branch 'dave/buildsys'
commitd158dde30c378acc8e88d5208aa837f92331af9e
authorDan McGee <dan@archlinux.org>
Mon, 9 Apr 2012 02:55:30 +0000 (8 21:55 -0500)
committerDan McGee <dan@archlinux.org>
Mon, 9 Apr 2012 02:55:30 +0000 (8 21:55 -0500)
treeb99456c7b765becdb5bab3869af5a2e512026562
parent31091963edaa505d00642aecb9950ce087a40b73
parentb729ed01093312cef7ce48d07b13e225b25446db
Merge remote-tracking branch 'dave/buildsys'

Oh god, what are we thinking thinking merging this. Hopefully this works with
only a few follow-up patches necessary.