Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sat, 21 Feb 2009 22:25:26 +0000 (17:25 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sat, 21 Feb 2009 22:25:26 +0000 (17:25 -0500)

Trivial merge