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

[cheeselee]

commit 02a847b2e1103b37267c2ec46e61dd1e324ae1ca
Merge: 30e4944 c121e38
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Wed Jan 25 17:00:11 2012 +0800

    Merge branch 'master' into el5

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