merge of '0df24d50b2a3e2b52a0f5072b0e7ad8716db582e'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 Jan 2008 21:17:06 +0000 (21:17 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 Jan 2008 21:17:06 +0000 (21:17 +0000)
     and 'e41398d20c55fd8c83bc62b4900cf81ad587f19a'


Trivial merge