Merge remote branch 'dkg/master'
authorJameson Rollins <jrollins@finestructure.net>
Sun, 4 Jul 2010 04:16:26 +0000 (00:16 -0400)
committerJameson Rollins <jrollins@finestructure.net>
Sun, 4 Jul 2010 04:16:26 +0000 (00:16 -0400)

Trivial merge