merge of '155b946e1f6b7b62c440a6a3287064abab85ba61'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 18 Jun 2007 14:13:49 +0000 (14:13 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 18 Jun 2007 14:13:49 +0000 (14:13 +0000)
     and '9156f7c12e244efcb93a5c9a0bc98ca6c3bfd786'


Trivial merge