merge of '6d7ffa8639429361a773bc0b2834f143afea7a5d'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 23 Aug 2007 08:09:06 +0000 (08:09 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 23 Aug 2007 08:09:06 +0000 (08:09 +0000)
     and 'f5d5db6248103717a176f43e8af03f6ef4c4dc61'


Trivial merge