merge of '04df4bfb5309be414eb8f12a269e5e70d3ed2dcf'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 19 Mar 2007 08:29:58 +0000 (08:29 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 19 Mar 2007 08:29:58 +0000 (08:29 +0000)
     and '412ed26aa5981edbb54c3ee57c2665a80d7ae122'


Trivial merge