merge of '112f00d072dac9a989e6b502c04819e4f2a2be86'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 6 Aug 2007 11:58:19 +0000 (11:58 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 6 Aug 2007 11:58:19 +0000 (11:58 +0000)
     and 'bd74f0d95f3b638b0b4131cb4eb597be6b3b4198'


Trivial merge