Merged from myself.
authorMonty Taylor <mordred@inaugust.com>
Tue, 14 Jul 2009 19:18:55 +0000 (12:18 -0700)
committerMonty Taylor <mordred@inaugust.com>
Tue, 14 Jul 2009 19:18:55 +0000 (12:18 -0700)

Trivial merge