merge of '1608fc5062abdfc7660b3e33f0ae5ce2b91f8dc1'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 25 May 2007 07:32:45 +0000 (07:32 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 25 May 2007 07:32:45 +0000 (07:32 +0000)
     and '78c366f7378d6982a8ac035f7baa1e929b6beba9'


Trivial merge