merge of '242e744e01fe3fbbbae94031b14a816bec5caeae'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 11 Jan 2007 05:01:57 +0000 (05:01 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 11 Jan 2007 05:01:57 +0000 (05:01 +0000)
     and 'cec9dea27c828bc6ef75f6e0fe0254ada1f011cb'


Trivial merge