merge of 'adf6b2ff45e62d57dd1f4e1c9f4cabd669b74f07'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Wed, 6 Jun 2007 18:49:30 +0000 (18:49 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Wed, 6 Jun 2007 18:49:30 +0000 (18:49 +0000)
     and 'bc3cedd5ae325304773d85b380ab5cf74ea65020'


Trivial merge