[amide/f14: 3/3] Merge branch 'master' into f14

[Christoph Wickert]

commit 63d098cd75d161c6d58ba70e26a7bd269a729cb9
Merge: 939e212 9813175
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Oct 9 23:44:09 2011 +0200

    Merge branch 'master' into f14

 .gitignore |    2 ++
 amide.spec |   39 ++++++++++++++++++++++-----------------
 sources    |    1 +
 3 files changed, 25 insertions(+), 17 deletions(-)
---