merge of '8ccdb265a85a26c39e7d32c6e86840ea4cebb4b3'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 15:09:16 +0000 (15:09 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 15:09:16 +0000 (15:09 +0000)
     and 'e29766ec663642e32d6682b92e767b9b43dbe524'


Trivial merge