merge of '6fbaa4dcc3640605ad76e93bbea2d08d823badbb'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 16 Feb 2008 16:32:49 +0000 (16:32 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 16 Feb 2008 16:32:49 +0000 (16:32 +0000)
     and '98f85bb96baab42bb0d213a35c2cd9f1c06a3f47'


Trivial merge