[gnome-initial-setup/shell/4765: 177/362] Merge pull request #41 from endlessm/shell/3480

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

commit 9bdaef12a4de48587778bad373dba7c4a247a7f2
Merge: ce21d5b 9bee4a3
Author: Roddy Shuler <roddy endlessm com>
Date:   Wed Aug 27 07:40:38 2014 -0700

    Merge pull request #41 from endlessm/shell/3480
    
    keyboard: ignore locales without a language name

 .../pages/keyboard/cc-input-chooser.c              |   23 ++++++++++---------
 1 files changed, 12 insertions(+), 11 deletions(-)
---