Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Fri, 24 Jul 2009 15:08:35 +0000 (11:08 -0400)
committerJameson Graef Rollins <jrollins@finestructure.net>
Fri, 24 Jul 2009 15:08:35 +0000 (11:08 -0400)

Trivial merge