Merge commit 'dkg/master'
authorMicah Anderson <micah@riseup.net>
Wed, 3 Sep 2008 19:28:30 +0000 (15:28 -0400)
committerMicah Anderson <micah@riseup.net>
Wed, 3 Sep 2008 19:28:30 +0000 (15:28 -0400)

Trivial merge