Merge commit 'dkg/master'
authorMicah Anderson <micah@riseup.net>
Tue, 18 Nov 2008 06:36:18 +0000 (01:36 -0500)
committerMicah Anderson <micah@riseup.net>
Tue, 18 Nov 2008 06:36:18 +0000 (01:36 -0500)

Trivial merge