merge of 'cf8866589186429f04cb84d5aa2437a100e6dcb9'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 16 Dec 2007 09:42:22 +0000 (09:42 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 16 Dec 2007 09:42:22 +0000 (09:42 +0000)
     and 'e52ae81072be7ee799a55832f18200f23bff5339'


Trivial merge