merge of '1d5bc74366555c918ab3f1f2f9c2231aa64356ae'
authorJustin Patrin <papercrane@gmail.com>
Thu, 16 Nov 2006 00:04:13 +0000 (00:04 +0000)
committerJustin Patrin <papercrane@gmail.com>
Thu, 16 Nov 2006 00:04:13 +0000 (00:04 +0000)
     and '96668be22966346391b27778ded3a562fb280fce'


Trivial merge