Merge commit 'dkg/master'
authorMicah Anderson <micah@riseup.net>
Sat, 31 Jan 2009 23:58:26 +0000 (18:58 -0500)
committerMicah Anderson <micah@riseup.net>
Sat, 31 Jan 2009 23:58:26 +0000 (18:58 -0500)

Trivial merge