Merge branch 'build-system'
authorBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 6 Mar 2013 23:47:38 +0000 (15:47 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 6 Mar 2013 23:47:38 +0000 (15:47 -0800)

Trivial merge