merge of '9f9b86bbd2f122252996f226e9935395f5db92c5'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Tue, 20 Nov 2007 10:37:28 +0000 (10:37 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Tue, 20 Nov 2007 10:37:28 +0000 (10:37 +0000)
     and 'eef79e907bd4bf985b56b57027a4b9fb08dbd26a'


Trivial merge