merge of '48538c8eb890138522fdaa67c07c26e8dccd5419'
authorJustin Patrin <papercrane@gmail.com>
Fri, 1 Jun 2007 06:56:18 +0000 (06:56 +0000)
committerJustin Patrin <papercrane@gmail.com>
Fri, 1 Jun 2007 06:56:18 +0000 (06:56 +0000)
     and '73c801b307019899c3255b427e2bb7cb896f8375'


Trivial merge