merge of '447b400a2b8caf7591734fb1f909d36eda572edc'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 22 Dec 2007 17:45:39 +0000 (17:45 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 22 Dec 2007 17:45:39 +0000 (17:45 +0000)
     and 'b781317fba3fb746b1b5c4ba5bab647df2775330'


Trivial merge