merge of '071c04d5f8eb97e9afafd54dd204bebd1c9ace4d'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 20:02:07 +0000 (20:02 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 20:02:07 +0000 (20:02 +0000)
     and 'b1742880fc1682d031f531ed84a3895ac55ac199'


Trivial merge