[gnome-initial-setup/shell/4765: 270/362] Merge branch 'master' for Release_2.1.7-rc30

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

commit b444bae747c2cc5c82bfd71c41d710e15f3a1661
Merge: 2f63729 131dd04
Author: Jenkins <jenkins endlessm com>
Date:   Wed Oct 8 20:59:31 2014 -0700

    Merge branch 'master' for Release_2.1.7-rc30

 .gitignore                                         |    2 +-
 .../pages/account/gis-account-page.c               |    6 +-
 .../pages/keyboard/gis-keyboard-page.c             |    2 +-
 .../pages/location/cc-timezone-monitor.c           |    4 +-
 gnome-initial-setup/pages/summary/Makefile.am      |   12 +-
 ...FBE.xml => com.endlessm.Tutorial.FBERemote.xml} |    4 +-
 .../pages/summary/gis-summary-page.c               |  132 +++++++-------------
 7 files changed, 63 insertions(+), 99 deletions(-)
---