Merge remote branch 'dkg/master'
authorJameson Rollins <jrollins@finestructure.net>
Sat, 9 Jan 2010 22:39:34 +0000 (17:39 -0500)
committerJameson Rollins <jrollins@finestructure.net>
Sat, 9 Jan 2010 22:39:34 +0000 (17:39 -0500)

Trivial merge