merge of '67bd2a01b2c73ef78e1377bb96d53fbd47234ce4'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 28 Dec 2006 18:29:03 +0000 (18:29 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 28 Dec 2006 18:29:03 +0000 (18:29 +0000)
     and '7f3e4e4b673d55d27ea70c09699c29ae8871a6f5'


Trivial merge