merge of 'c4e3261ed96dba8896cae7e15744b68c96b7e8c1'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Fri, 19 Oct 2007 09:22:18 +0000 (09:22 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Fri, 19 Oct 2007 09:22:18 +0000 (09:22 +0000)
     and 'd83ba938c9369922d831e50479427b9da8e684e0'


Trivial merge