Merge of configure
authorBrian Aker <brian@gaz>
Sat, 13 Jun 2009 21:23:48 +0000 (14:23 -0700)
committerBrian Aker <brian@gaz>
Sat, 13 Jun 2009 21:23:48 +0000 (14:23 -0700)

Trivial merge