merge of 'a44afc798e40bba1259a38bb3528b174fe0f726f'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 6 Jan 2007 16:44:56 +0000 (16:44 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 6 Jan 2007 16:44:56 +0000 (16:44 +0000)
     and 'ff4945554f42e9be0ee0cf9d1a222718ac61d4b6'


Trivial merge