merge of '4f3ceea2e479c0f56f4f87cb516cab45429d0856'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 17 Dec 2007 19:46:45 +0000 (19:46 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 17 Dec 2007 19:46:45 +0000 (19:46 +0000)
     and 'ccdb554f27d940b07a6e6b9686617b0aa58f3374'


Trivial merge