merge of '2bca6e25fe69490be6f9ac7ad3fa27491ca1298e'
authorJustin Patrin <papercrane@gmail.com>
Wed, 15 Nov 2006 22:46:44 +0000 (22:46 +0000)
committerJustin Patrin <papercrane@gmail.com>
Wed, 15 Nov 2006 22:46:44 +0000 (22:46 +0000)
     and '3ab6e5380059008d97ce4f94d05e71e71cfc7b2d'


Trivial merge