merge of '0788f41e36cf5b4b88c53ce9aa763d4e9ef4effe'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 20 Jun 2007 18:34:01 +0000 (18:34 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 20 Jun 2007 18:34:01 +0000 (18:34 +0000)
     and '0b1741c2cb8e66a82741314429764b02c98a2b9a'


Trivial merge