artdaw
committed
on 25 Mar 11
RF-10753: all changes are merged