merge of '9bb9579fd7698d62103b3f88f6d0910f8ba1e53d'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 1 May 2008 13:43:48 +0000 (13:43 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 1 May 2008 13:43:48 +0000 (13:43 +0000)
     and 'd8f83de5204562e9c23bd329d59d35006de0f0f8'


Trivial merge