merge of '14e97fe0b2064e524213634d9ffbc49971355012'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 5 May 2008 10:38:41 +0000 (10:38 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 5 May 2008 10:38:41 +0000 (10:38 +0000)
     and '6a17da034d40be82432b199217a8b5154f13f48a'


Trivial merge