merge of 'caa0c450f832bf45bc76ce27137638501f3a4fd3'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 11 Jun 2007 10:10:55 +0000 (10:10 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 11 Jun 2007 10:10:55 +0000 (10:10 +0000)
     and 'f9ff12dcec70bc48a78a8863c23db1b086a15b88'


Trivial merge