merge of 'c80492670adbda2d61a72a0c64c1a2a873d10b51'
authorJustin Patrin <papercrane@gmail.com>
Thu, 28 Jun 2007 15:06:42 +0000 (15:06 +0000)
committerJustin Patrin <papercrane@gmail.com>
Thu, 28 Jun 2007 15:06:42 +0000 (15:06 +0000)
     and 'df3f0f654af4ab20778a61e050187c6f94876b9d'


Trivial merge