merge of '2c62d5f53df6ab7b1ada734c156e6c252c1ef900'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 5 May 2008 10:40:17 +0000 (10:40 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 5 May 2008 10:40:17 +0000 (10:40 +0000)
     and '996e4e3c8e89056619f693368ad07d4870016cd6'


Trivial merge