merge of '0ddcb5d93c6823446f17c0303c740ad3d73f821c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 8 Mar 2008 11:31:49 +0000 (11:31 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 8 Mar 2008 11:31:49 +0000 (11:31 +0000)
     and 'ea4c245b169cb6f11be84dd55e1615f6b3c50a90'


Trivial merge