merge of '70d8d53625d2045ac36f38c922f7e3867e8c8bb7'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 11 Jun 2007 18:17:25 +0000 (18:17 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 11 Jun 2007 18:17:25 +0000 (18:17 +0000)
     and 'd82c8a6b3b1ea13ae5fd256983ca2930af242c83'


Trivial merge