merge of 'ac1784612908005401efde55a082dc8fa374bd2e'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 25 Aug 2008 06:38:59 +0000 (06:38 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 25 Aug 2008 06:38:59 +0000 (06:38 +0000)
     and 'b5d747a62fcad9a8d4c7d2f3c250f3e614028a15'


Trivial merge