merge of '1c7464901fc8ab3cb0e3ade6fdf445011603f0c4'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 15 Feb 2007 12:15:11 +0000 (12:15 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 15 Feb 2007 12:15:11 +0000 (12:15 +0000)
     and 'dfc0afa827cc70fb16b4745a4b47906239789d61'


Trivial merge