Merge remote branch 'dkg/master'
authorJameson Rollins <jrollins@finestructure.net>
Mon, 18 Jan 2010 17:05:37 +0000 (12:05 -0500)
committerJameson Rollins <jrollins@finestructure.net>
Mon, 18 Jan 2010 17:05:37 +0000 (12:05 -0500)

Trivial merge