merge of '56704f7503bb0227cf679daac7659f9d259379ee'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 17 Feb 2008 14:28:31 +0000 (14:28 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 17 Feb 2008 14:28:31 +0000 (14:28 +0000)
     and '6bbae187bae4f40bad7b2577220dde3fded1edc1'


Trivial merge