[conduit/config-unstable] (19 commits) ...Merge branch 'config-google' into config-unstable

[Alexandre Rosenfeld <arosenfeld src gnome org>]

Summary of changes:

  424cbf4... Initial work to improve settings serialization (*)
  34b0d17... Merge google branch from airmind's github (*)
  8c9aab7... Merged SmugMugModule from config-unstable (*)
  99169c4... Merged Shutterfly modification from config-unstable (*)
  18a138e... Finished porting SmugMug to new config system. (*)
  771b083... Finished porting Shutterfly to new config system. (*)
  426547b... Updated Portuguese translation (*)
  0b1be11... Merge branch 'master' into config-google (*)
  aefc44f... Cnverted YouTube and Google Documents to new config (*)
  d95e2ac... Added *~ to .gitignore (*)
  e96aec9... Merge branch 'master' into config-google (*)
  8fddba5... Finished porting Google dataproviders to the new config (*)
  8c6ef3a... Merge branch 'master' into config-unstable
  dcc51a1... Small changes to the XML Serialization code. (*)
  5c056c8... Ensure the choices is initialized in the google contacts da (*)
  3ec2fd8... Merge branch 'config-google' into config-unstable
  d64e5b9... Fixed files and folders serialization.
  e8f3ef2... Merge commit 'origin/config-google' into config-google (*)
  6420293... Merge branch 'config-google' into config-unstable

(*) This commit already existed in another branch; no separate mail sent