merge of '1bb8268fd7793fa7cde34e0d086742cc7a98a639'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 11 May 2007 11:48:22 +0000 (11:48 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 11 May 2007 11:48:22 +0000 (11:48 +0000)
     and '88cbce2efbfb5b53d746089e00d4c028271d57d2'


Trivial merge