merge of '7732d3566dfef1479ce902ea965313de063af76b'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 22 Dec 2007 18:37:38 +0000 (18:37 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 22 Dec 2007 18:37:38 +0000 (18:37 +0000)
     and '9df68d6a3801ea07a13495709fb272b2f10b2af8'


Trivial merge