merge of '6b9317985dfcaa8a8a68bee3324d6644fcd77d37'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 28 Aug 2006 21:08:35 +0000 (21:08 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 28 Aug 2006 21:08:35 +0000 (21:08 +0000)
     and 'ec53b521bf7363852dff07392e93d3fff7154025'


Trivial merge