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

[Karel Klíč]

commit b9a3b974205f2cb6eb61ee430af2a5a5a2a3713f
Merge: a540b54 f74aea1
Author: Karel Klic <kklic at redhat.com>
Date:   Fri Jun 8 16:41:00 2012 +0200

    Merge branch 'master' into f17

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