[system-config-keyboard/f13: 7/7] Merge branch 'master' into f13

[Toshio くらとみ]

commit 28ea0c64814b75c7e4b51de6f110bd62fa336a08
Merge: 6f84237 19dafad
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Jun 17 00:32:22 2011 -0700

    Merge branch 'master' into f13

 s-c-keyboard-do_not_remove_the_OK_button.patch |   20 ++++++++++++++++++++
 system-config-keyboard.spec                    |   23 ++++++++++++++++++++---
 2 files changed, 40 insertions(+), 3 deletions(-)
---