merge of '24a6bbd3a00726598e9a364df32f1abdff8750bf'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 5 Feb 2007 19:46:14 +0000 (19:46 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 5 Feb 2007 19:46:14 +0000 (19:46 +0000)
     and '30bf52d6fbef1c40328bf96f24a20f1a6d9981a7'


Trivial merge