merge of '4df1badaa6742b2ffb1171205da321c1f5040b56'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 19 Feb 2008 14:18:03 +0000 (14:18 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 19 Feb 2008 14:18:03 +0000 (14:18 +0000)
     and 'b479f8d698f9ffbf0d7660f38e17cd501db0dff2'


Trivial merge