merge of '06c65f7df2a61bcad082ca5110a1c949ac902ae4'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 13 Jan 2008 11:48:59 +0000 (11:48 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 13 Jan 2008 11:48:59 +0000 (11:48 +0000)
     and '37c39841f1cbbf2ca651ce71ff495b7bda859ae5'


Trivial merge