Merged trunk.
authorMonty Taylor <mordred@inaugust.com>
Thu, 9 Jul 2009 18:34:46 +0000 (11:34 -0700)
committerMonty Taylor <mordred@inaugust.com>
Thu, 9 Jul 2009 18:34:46 +0000 (11:34 -0700)

Trivial merge