merge of '1f105f36299c6054d7758befecdb4b1b4f596b6e'
authorJustin Patrin <papercrane@gmail.com>
Tue, 29 Aug 2006 16:21:51 +0000 (16:21 +0000)
committerJustin Patrin <papercrane@gmail.com>
Tue, 29 Aug 2006 16:21:51 +0000 (16:21 +0000)
     and '4d391acc34407b3bf053f8ca785f9789943953da'


Trivial merge