merge of '4f12086dd4becc0837a2479c289abb8ce97cc931'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 4 Sep 2007 16:23:16 +0000 (16:23 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 4 Sep 2007 16:23:16 +0000 (16:23 +0000)
     and '8c69b6f5a69bd9c930b72d9ba3949a8f629a5721'


Trivial merge