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)
commit14482931e4e65e04feef0b984c194d8dae5c1bfe
treefe7c17e72299c6c55c43c638ec7c93a276a9979f
parent0678b3c36030e131b96bd0f5838588e4394aa3c8
parent38f9980e295269f51b532657067604a29e9d54b3
Merge ... '1d6a9becb57e689050e4b9b1fb6482e04e3e5111'
     and 'dd34c96ee9d492fd08a5d56c4405aee69f2740ee'