merge of '67254ac9ecc3abdbf0b718b05d6eaa8d6b4b6e92'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Tue, 25 Mar 2008 06:35:35 +0000 (06:35 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Tue, 25 Mar 2008 06:35:35 +0000 (06:35 +0000)
     and '6e883229c491cafc759e732de8b7df6be2b32ca2'


Trivial merge