merge of '073ad5402a8d039936fab5d043945003a8b19e1e'
authorJustin Patrin <papercrane@gmail.com>
Tue, 29 Aug 2006 16:22:04 +0000 (16:22 +0000)
committerJustin Patrin <papercrane@gmail.com>
Tue, 29 Aug 2006 16:22:04 +0000 (16:22 +0000)
     and 'eca6b7068b47ce654a33df5f448eff310501545e'


Trivial merge