merge of 'b1eb3466dafc9eb0908b3c6a5749e44c83d43bb7'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 31 Dec 2007 16:05:19 +0000 (16:05 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 31 Dec 2007 16:05:19 +0000 (16:05 +0000)
     and 'b6f7470fdaebd8e390033a44122a002d406951ab'


Trivial merge