merge of '149dfb1081cb62d1c9aa3bbe4e3da5da3136a2f0'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 19:30:32 +0000 (19:30 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 19:30:32 +0000 (19:30 +0000)
     and '2b9d4857ec4fc9b7d0efa0dbf18c7a2b6f5b788f'


Trivial merge