merge of '1516e610cec317d2dbc1f14ae7359ef7c80a1182'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 14 Jan 2007 20:02:56 +0000 (20:02 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 14 Jan 2007 20:02:56 +0000 (20:02 +0000)
     and '6e924857d53cc46c5b976a0cc3aa2dce32bf74a2'


Trivial merge