merge of '2e2fceb9af5c82c6cf12adb7606b22b485e6c8a1'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Fri, 19 Oct 2007 11:07:33 +0000 (11:07 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Fri, 19 Oct 2007 11:07:33 +0000 (11:07 +0000)
     and '5330f9734ae1ce67724d8b58f45cd276d8a82865'


Trivial merge