merge of '93723410c189ef3068ef506f4970af5d12467d3c'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Wed, 14 Feb 2007 10:00:21 +0000 (10:00 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Wed, 14 Feb 2007 10:00:21 +0000 (10:00 +0000)
     and 'a47d5b256020a6249b1edfdd38a5a73b3fa2cb5b'


Trivial merge