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

Trivial merge