merge of '0d28663b1cddb7ffeb3f2c43b300935b7b432b98'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 15 Dec 2007 22:40:53 +0000 (22:40 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 15 Dec 2007 22:40:53 +0000 (22:40 +0000)
     and '673818154cbb2b32a756188c27a827021f5d81f5'


Trivial merge