[gnome-initial-setup/shell/4765: 53/362] Merge pull request #11 from endlessm/shell/2670

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

commit 4f38aa820ba78b0dda9d6effdfb136453f849f74
Merge: 7cb27b0 df827de
Author: Roddy Shuler <roddy endlessm com>
Date:   Mon Jun 9 21:13:53 2014 -0700

    Merge pull request #11 from endlessm/shell/2670
    
    Shell/2670

 data/Makefile.am                                   |    2 +-
 data/product_serial.conf                           |    2 +-
 .../gnome-initial-setup-copy-worker.c              |    1 +
 .../pages/keyboard/gis-keyboard-page.c             |    1 -
 .../pages/language/gis-language-page.c             |   92 ++++++++++++++-----
 .../pages/location/cc-timezone-monitor.c           |    2 -
 .../pages/location/gis-location-page.c             |    3 +-
 7 files changed, 72 insertions(+), 31 deletions(-)
---