merge of '2087be8072069ca04fed4f7641aed94abcddeabd'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Sun, 29 Apr 2007 15:52:25 +0000 (15:52 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Sun, 29 Apr 2007 15:52:25 +0000 (15:52 +0000)
     and '62ddceade7b13ecdec3ff4ff1a0f8412312a23e2'


Trivial merge