merge of '405ed6c43e365446c1163c52c1a434ed0a270e85'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 15 Feb 2008 09:31:57 +0000 (09:31 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 15 Feb 2008 09:31:57 +0000 (09:31 +0000)
     and '8173bd390c2d8b35940c27c8d74d2d0acad96781'


Trivial merge