merge of '74b3b0723f0fb27c013a0a8ddda58f6db2d0a7e6'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 21 Feb 2008 22:43:24 +0000 (22:43 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 21 Feb 2008 22:43:24 +0000 (22:43 +0000)
     and 'a069edff67190dd075da435413c61a82531a2e2e'


Trivial merge