merge of '2885bcf71708b743b470fd783dc7a3efacc0d707'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 28 Sep 2006 18:12:19 +0000 (18:12 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 28 Sep 2006 18:12:19 +0000 (18:12 +0000)
     and 'dabb67bf3eb39cc2ba26d3beb69b313a14f1da7b'


Trivial merge