merge of '0e26ba58720a1849aa7900d3994580287bca5ac9'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 23 Aug 2007 15:52:17 +0000 (15:52 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 23 Aug 2007 15:52:17 +0000 (15:52 +0000)
     and '308da270e0ec4f56bfc763e5a9961617e8f09c92'


Trivial merge