merge of '6fe43ab76c4fc12eb8d88adfd84e1aa260ca5d6f'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Wed, 2 Apr 2008 09:33:38 +0000 (09:33 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Wed, 2 Apr 2008 09:33:38 +0000 (09:33 +0000)
     and 'c77bda4ba3178abef09bacdc2fbf63fd225870ca'


Trivial merge