merge of '2727f9135b6cab138d8484eaefc8eda4afcfbc41'
authorJustin Patrin <papercrane@gmail.com>
Thu, 24 Aug 2006 16:51:15 +0000 (16:51 +0000)
committerJustin Patrin <papercrane@gmail.com>
Thu, 24 Aug 2006 16:51:15 +0000 (16:51 +0000)
     and '9bd8fd454a7f2f34cfe7e3a27b1f18aaab798336'


Trivial merge