[emacs/f17: 3/3] merge from master

[Karel Klíč]

commit a540b54fa330d915d59300d02eba09acf5f6644a
Merge: 9d4dcad d68adde
Author: Karel Klic <kklic at redhat.com>
Date:   Mon May 21 12:58:26 2012 +0200

    merge from master

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