[ack/el6: 14/14] Merge branch 'master' into el6

[李瑞彬]

commit 57def9502e61c61b7cf6f6d1cae3c1d4e005e239
Merge: 2d55e34 286d8b3
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Sat Mar 29 15:06:03 2014 +0800

    Merge branch 'master' into el6

 .gitignore |    5 +++++
 ack.spec   |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 sources    |    2 +-
 3 files changed, 56 insertions(+), 10 deletions(-)
---