[gnome-initial-setup/f21: 5/5] Merge commit '9bcbfbac3dd96cad44cba042b3f36b9c12ba2574' into f21

[Adam Williamson]

commit ae2d3912abd53990e37f83d238055791f0f1ea3d
Merge: 7f9def5 9bcbfba
Author: Adam Williamson <awilliam at redhat.com>
Date:   Mon Sep 8 20:59:22 2014 -0700

    Merge commit '9bcbfbac3dd96cad44cba042b3f36b9c12ba2574' into f21
    
    Conflicts:
    	gnome-initial-setup.spec

 0001-keyboard-Include-all-layouts.patch |   35 +++++++++++++++++++++++++++++++
 gnome-initial-setup.spec                |    9 +++++++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---