merge of '1d12a1b636559d38c780ceef99084b156db20d5c'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Wed, 8 Aug 2007 19:13:15 +0000 (19:13 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Wed, 8 Aug 2007 19:13:15 +0000 (19:13 +0000)
     and '2e54381567b1f0b7bfc5f9032b394a001112093a'


Trivial merge