merge of 'd6472bcf61be355b72e9d96a067952d4f9b12831'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 7 Apr 2007 11:48:06 +0000 (11:48 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 7 Apr 2007 11:48:06 +0000 (11:48 +0000)
     and 'e626ab4b1d3176dbf790f7d530dd936881f3e60a'


Trivial merge