Merged from me.
authorMonty Taylor <mordred@inaugust.com>
Mon, 15 Jun 2009 00:52:00 +0000 (17:52 -0700)
committerMonty Taylor <mordred@inaugust.com>
Mon, 15 Jun 2009 00:52:00 +0000 (17:52 -0700)

Trivial merge