Merged trunk.
authorMonty Taylor <mordred@inaugust.com>
Wed, 16 Sep 2009 08:52:26 +0000 (01:52 -0700)
committerMonty Taylor <mordred@inaugust.com>
Wed, 16 Sep 2009 08:52:26 +0000 (01:52 -0700)

Trivial merge