Merge remote branch 'mjgoins/master'
authorJameson Rollins <jrollins@finestructure.net>
Mon, 11 Jan 2010 00:49:12 +0000 (19:49 -0500)
committerJameson Rollins <jrollins@finestructure.net>
Mon, 11 Jan 2010 00:49:12 +0000 (19:49 -0500)

Trivial merge