merge of '1af32cac223255a8b64acab6e9b8aa5a8c5f3142'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Wed, 26 Mar 2008 06:27:43 +0000 (06:27 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Wed, 26 Mar 2008 06:27:43 +0000 (06:27 +0000)
     and '1d205cceb88799688dad02620d65bb08678fccd9'


Trivial merge