Merging to trunk
Merging to trunk

community-ssu/hildon,android-808/libhildon,android-808/libhildon,archlinuxarm-n900/libhildon,android-808/libhildon,Cordia/libhildon,archlinuxarm-n900/libhildon,archlinuxarm-n900/libhildon,Cordia/libhildon,community-ssu/hildon,community-ssu/hildon,Cordia/libhildon