merge of '932bb6fa0e80d486c10b983e9557b9f2cc12f81d'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Jul 2007 21:15:05 +0000 (21:15 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Jul 2007 21:15:05 +0000 (21:15 +0000)
     and 'adc9d2b07147baa9165b930a857e39f5f57331a3'


Trivial merge