[emacs/f17: 6/6] Merge branch 'master' into f17

[Karel Klíč]

commit 064dd3225f17eb282c8d324bd2367e1f96d47b67
Merge: b9a3b97 13d4c01
Author: Karel Klic <kklic at redhat.com>
Date:   Mon Jun 18 18:27:17 2012 +0200

    Merge branch 'master' into f17

 .gitignore |    1 +
 emacs.spec |   15 +++++++++------
 sources    |    2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)
---