Merge remote branch 'dkg/master'
authorJameson Rollins <jrollins@finestructure.net>
Sun, 10 Jan 2010 01:09:38 +0000 (20:09 -0500)
committerJameson Rollins <jrollins@finestructure.net>
Sun, 10 Jan 2010 01:09:38 +0000 (20:09 -0500)

Trivial merge