merge of '3096507e1176a6f381be085273c56ec4c8587ec8'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 6 Feb 2008 16:38:16 +0000 (16:38 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 6 Feb 2008 16:38:16 +0000 (16:38 +0000)
     and 'a86b893a92c8dbd634262771afe20a8eb26f2b82'


Trivial merge