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

[Todd Zullinger]

commit eb03c43e0319508800d3b7d0a1a39edd349648a8
Merge: d53b043 e92f127
Author: Todd Zullinger <tmz at pobox.com>
Date:   Fri Jul 22 09:37:57 2011 -0400

    Merge branch 'master' into el5

 cgit.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---