merge of '6c2d621bdfd446c13552a5e4b126ef9c5dd20106'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 21 Feb 2008 16:19:39 +0000 (16:19 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 21 Feb 2008 16:19:39 +0000 (16:19 +0000)
     and 'f8d54cc4c0dfc594e55d38708db17f5d5c68846a'


Trivial merge