Merge commit 'mlcastle/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sat, 11 Jul 2009 20:06:50 +0000 (16:06 -0400)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sat, 11 Jul 2009 20:06:50 +0000 (16:06 -0400)

Trivial merge