merge of '16870ac6a3db7be6fbf7b3822f05293c360ca11a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 15 Feb 2008 01:02:33 +0000 (01:02 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 15 Feb 2008 01:02:33 +0000 (01:02 +0000)
     and '6d8388a3331ac09ba7e6c0f3cf6688f303afd4e1'


Trivial merge