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

[cheeselee]

commit 2d55e34a6dacb753fa097e1b5dcbe840414e235c
Merge: ba76eda c121e38
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Wed Jan 25 16:52:19 2012 +0800

    Merge branch 'master' into el6

 .gitignore |    1 +
 ack.spec   |   31 ++++++++++++++++++++-----------
 sources    |    2 +-
 3 files changed, 22 insertions(+), 12 deletions(-)
---