[gnome-initial-setup/shell/4765: 103/362] Merge branch 'master' for Release_2.1.0-rc3

[Jasper St. Pierre <jstpierre src gnome org>]

commit 5f6f1b75edc91c229ff7682c00ea7df93c04bd17
Merge: d604182 afff48a
Author: Jenkins <jenkins endlessm com>
Date:   Tue Jul 15 21:36:13 2014 -0700

    Merge branch 'master' for Release_2.1.0-rc3

 configure.ac                                       |    4 +-
 data/gnome-initial-setup-copy-worker.desktop.in.in |    2 +-
 data/initial-setup.json                            |    2 +-
 gnome-initial-setup/Makefile.am                    |    5 +-
 gnome-initial-setup/gis-keyring.c                  |  124 ++++++++++++++++++++
 gnome-initial-setup/gis-keyring.h                  |   36 ++++++
 gnome-initial-setup/gnome-initial-setup.c          |    1 +
 gnome-initial-setup/gnome-initial-setup.h          |    1 +
 .../pages/account/gis-account-page.c               |   10 ++-
 9 files changed, 178 insertions(+), 7 deletions(-)
---