merge of '068146008b7c87a1880b72e17b5b0c1b302a5129'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 2 Sep 2007 10:15:48 +0000 (10:15 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 2 Sep 2007 10:15:48 +0000 (10:15 +0000)
     and '91c7d956f1032bf18374f51850a10c5cdef6abba'


Trivial merge