Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sat, 18 Jul 2009 18:11:02 +0000 (14:11 -0400)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sat, 18 Jul 2009 18:11:02 +0000 (14:11 -0400)

Trivial merge