merge of '06ce69bdc60c0c1af032aa86ee3e1084efc8a90f'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 8 Mar 2008 18:22:55 +0000 (18:22 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 8 Mar 2008 18:22:55 +0000 (18:22 +0000)
     and '78a91dd85df256e5c35bffcb15ad33cc39787cc2'


Trivial merge