merge of '7bdbc64d5f4962d2cca1a7f99fe115d3fcd0aea5'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 18 Dec 2006 19:48:16 +0000 (19:48 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 18 Dec 2006 19:48:16 +0000 (19:48 +0000)
     and 'fe7f09c0ab220b629fe9a568245cfe155bbeb443'


Trivial merge