merge of '14f068bc8b024f32842f257eef00e729033b40d9'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 28 Aug 2006 19:40:09 +0000 (19:40 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 28 Aug 2006 19:40:09 +0000 (19:40 +0000)
     and 'df5459c38c625f17c9ac21c9ad5042cd931d077b'


Trivial merge