merge of '0555144bbfce710d5332e8c393cf6caf99ce8c8b'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 26 Jul 2007 14:03:00 +0000 (14:03 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 26 Jul 2007 14:03:00 +0000 (14:03 +0000)
     and '1454176608882d4fcee0bbb932b9a80e843b55be'


Trivial merge