merge of '4a6e894ff08f0d4e0d6af803eec158fb40198ad7'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 Jan 2008 11:05:39 +0000 (11:05 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 Jan 2008 11:05:39 +0000 (11:05 +0000)
     and 'a9cf4a7fde005b20905192e310ca984ba3cbdab4'


Trivial merge