# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268570969 0
# Node ID 16369ba022938ee04d4c9e8a970d261a08d1e3c1
# Parent  67b0a665852a189f94e5b20d298873901b8306a4# Parent  6752808b20362f2e6c90059cf5fd3a379491a5bc
Merge from PDK_3.0.h - (it's now identical)

diff -r 6752808b2036 -r 16369ba02293 harvester/server/src/harvesterao.cpp
diff -r 6752808b2036 -r 16369ba02293 harvester/server/src/harvesteroomao.cpp