merge of '7830f5e90162b4508a3948a7473f7d5ce3323e61'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 15 Dec 2007 05:14:53 +0000 (05:14 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 15 Dec 2007 05:14:53 +0000 (05:14 +0000)
     and 'e8d47d4912ea1a12367d5e883eed7934351adda2'


Trivial merge