merge of 'a7b6c0b68bc9a18f0b23fdb578ae8f808b2a242b'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 14 Sep 2006 03:20:10 +0000 (03:20 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 14 Sep 2006 03:20:10 +0000 (03:20 +0000)
     and 'e0dd8288a85ec7577d7ff6eb7670a1a4bd2a5a7c'


Trivial merge