Merge commit 'mjgoins/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sun, 1 Feb 2009 04:57:50 +0000 (23:57 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sun, 1 Feb 2009 04:57:50 +0000 (23:57 -0500)

Trivial merge