Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sat, 15 Nov 2008 20:59:34 +0000 (15:59 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sat, 15 Nov 2008 20:59:34 +0000 (15:59 -0500)

Trivial merge