merge of '1d6a9becb57e689050e4b9b1fb6482e04e3e5111'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Tue, 26 Aug 2008 18:33:48 +0000 (18:33 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Tue, 26 Aug 2008 18:33:48 +0000 (18:33 +0000)
     and 'dd34c96ee9d492fd08a5d56c4405aee69f2740ee'


Trivial merge