merge of '2b2a9e8be1e996a583b85b56656ca087e2b52b4b'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 May 2007 12:11:47 +0000 (12:11 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 May 2007 12:11:47 +0000 (12:11 +0000)
     and 'e51f8fd8eb90b9022f84e7606c680a142a3ca9c4'


Trivial merge