Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Fri, 20 Feb 2009 20:39:07 +0000 (15:39 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Fri, 20 Feb 2009 20:39:07 +0000 (15:39 -0500)

Trivial merge