merge of '0f81044fe7f22c4e80b9e840c9f9f4c6a6e8d1a2'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 13 Feb 2008 10:00:30 +0000 (10:00 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 13 Feb 2008 10:00:30 +0000 (10:00 +0000)
     and '16ce3628a1d3a9a9700cc501a3cb77666ed8c4a0'


Trivial merge