merge conflicts smita_harmattan
authorsmita <smita@smita-laptop.(none)>
Wed, 12 Jan 2011 12:23:56 +0000 (14:23 +0200)
committersmita <smita@smita-laptop.(none)>
Wed, 12 Jan 2011 12:23:56 +0000 (14:23 +0200)
commit3abcc46b030897fa6c02cd3f4eaa82100cd37fa9
treec9fc589b66938ae32c7882140cca6465c2495923
parentf9093f047edf97e729d38f399dd3f8fc250b692a
parentd20944132c0db7bd293806be0353ae0113afb028
merge conflicts
lib/AccountsUI/provider-plugin-process.cpp