merge of 'e5da8f4ab8c8240d2eee77d2cf6860c91f068802'
authorJustin Patrin <papercrane@gmail.com>
Fri, 17 Nov 2006 15:46:33 +0000 (15:46 +0000)
committerJustin Patrin <papercrane@gmail.com>
Fri, 17 Nov 2006 15:46:33 +0000 (15:46 +0000)
     and 'f234436408b3639fb2d9759caab0196629090f31'


Trivial merge