merge of '61fbd617cd31be5cf16e7fef30e206cf64890e27'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Wed, 22 Aug 2007 15:41:40 +0000 (15:41 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Wed, 22 Aug 2007 15:41:40 +0000 (15:41 +0000)
     and '842df413eedc02ad89050dbcaa83f9139bfa98b5'


Trivial merge