merge of '35986a7295900068759ed5a0148b77d46c088c66'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 15 Dec 2007 06:53:00 +0000 (06:53 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 15 Dec 2007 06:53:00 +0000 (06:53 +0000)
     and '3afbe0b60ab4c00ea448ef08a1d2f4da08be3465'


Trivial merge