merge of '2a3b367f33ce37c133f19ffba687595aa7b1cbb4'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 1 May 2008 05:50:40 +0000 (05:50 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 1 May 2008 05:50:40 +0000 (05:50 +0000)
     and '3828f582a9c1e77f2334c14bda8e79846078bfd3'


Trivial merge