merge of '590d553c33bb0be5913ed85157e07a6b2896b7bc'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 26 Jul 2007 15:00:06 +0000 (15:00 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 26 Jul 2007 15:00:06 +0000 (15:00 +0000)
     and 'd3d2de82071747b03daf36c862b44f3b362a7753'


Trivial merge