merge of '886f590eaf51aa5f80dff32c73a8d713ce989b3c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Dec 2006 09:48:43 +0000 (09:48 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Dec 2006 09:48:43 +0000 (09:48 +0000)
     and 'bbe0f81068d50c751254355e444d82da046b3a41'


Trivial merge