merge of '295685151d124dddda4263fcad5e205cd0c1e745'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 17 Jan 2008 13:04:19 +0000 (13:04 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 17 Jan 2008 13:04:19 +0000 (13:04 +0000)
     and '6c8738ab25503f1d21271ec5f6abc99991950ace'


Trivial merge