merge of '0fc95be78cc0959135ca79a4ec38a38f14160eef'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 12 Jul 2007 20:41:23 +0000 (20:41 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 12 Jul 2007 20:41:23 +0000 (20:41 +0000)
     and '4ed12f8853fc35aaa445b675fde2edc9d8b0f0ab'


Trivial merge