[cgit/el5: 2/2] Merge branch 'master' into el5

[Todd Zullinger]

commit 1e01c77f674bb8d8be32e5387d97e76ea9cc82f1
Merge: 2a9164a c7cf646
Author: Todd Zullinger <tmz at pobox.com>
Date:   Thu Jul 21 17:27:02 2011 -0400

    Merge branch 'master' into el5

 cgit.spec |    5 ++++-
 sources   |    3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)
---