merge of '2b629c70f36efd84d9157bcab5d582d59fa8258e'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 28 Jan 2008 00:12:34 +0000 (00:12 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 28 Jan 2008 00:12:34 +0000 (00:12 +0000)
     and 'a99dc9b34551aa3889d7057538bf2e37b0471af1'


Trivial merge