merge of '2deed37a9e4e5e16ae13941b32c64a3fe7f89630'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 14 Jan 2008 22:24:42 +0000 (22:24 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 14 Jan 2008 22:24:42 +0000 (22:24 +0000)
     and '685d383cf4795f34ac2470de61c67519695f99f1'


Trivial merge