merge of '87caae2907d7ea9c2073fdb7643ff7b317a29621'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 22 Dec 2007 12:36:01 +0000 (12:36 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 22 Dec 2007 12:36:01 +0000 (12:36 +0000)
     and 'e513f00eafa50f416e6cb891a85f04401cf3e99b'


Trivial merge