merge of '7ad3f9d635aeae55347b5d737664b09b109d5e44'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 19 Apr 2007 17:43:16 +0000 (17:43 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 19 Apr 2007 17:43:16 +0000 (17:43 +0000)
     and 'c52967556717cfa194f2126112fc25006c4cb7ab'


Trivial merge