merge of '6d8c580c215fa6c343a1c4854fc12d18080909db'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 18 Feb 2008 23:04:38 +0000 (23:04 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 18 Feb 2008 23:04:38 +0000 (23:04 +0000)
     and 'b3b92a70ff78c5b326825d71c4c28cc59a7fc00c'


Trivial merge