merge of '6cd1d9371d3072edd062423937b327dceec39bbc'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 14 Jan 2007 10:01:19 +0000 (10:01 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 14 Jan 2007 10:01:19 +0000 (10:01 +0000)
     and 'e9118e1c3f1bc5a110808561d9f9c3d0e58467bc'


Trivial merge