Merge remote branch 'mlcastle/master'
authorJameson Rollins <jrollins@finestructure.net>
Sat, 9 Jan 2010 19:31:08 +0000 (14:31 -0500)
committerJameson Rollins <jrollins@finestructure.net>
Sat, 9 Jan 2010 19:31:08 +0000 (14:31 -0500)

Trivial merge