merge of '7d8c3952daf9f091a203b0e0fa34bb7a25273315'
authorJustin Patrin <papercrane@gmail.com>
Fri, 17 Nov 2006 00:44:05 +0000 (00:44 +0000)
committerJustin Patrin <papercrane@gmail.com>
Fri, 17 Nov 2006 00:44:05 +0000 (00:44 +0000)
     and 'ae57dc7e211a075ccdde416f0e1dea5d8dc190ee'


Trivial merge