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

[Todd Zullinger]

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

    Merge branch 'master' into el6

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