merge of '63328a4d6b1c9e161ae2921b106b5136b02fb764'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 11 Jan 2008 21:17:25 +0000 (21:17 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 11 Jan 2008 21:17:25 +0000 (21:17 +0000)
     and 'd9c08e4fa1d5e137c28a0835802abcbcadeb294a'


Trivial merge