merge of '6f561d859809d8ecf2f630fa156e48ff01eec95e'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 7 Jun 2007 23:22:05 +0000 (23:22 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 7 Jun 2007 23:22:05 +0000 (23:22 +0000)
     and 'dc47960ed2e4a7c23345df36c3ffb76c1cf5df71'


Trivial merge