merge changes from upstream
authorJameson Graef Rollins <jrollins@finestructure.net>
Sat, 5 Dec 2009 06:19:53 +0000 (01:19 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sat, 5 Dec 2009 06:20:11 +0000 (01:20 -0500)

Trivial merge