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

[Todd Zullinger]

commit 9b5069b1dbec92d9b6014a11a4588c0fcc9fe032
Merge: 94360ed c7cf646
Author: Todd Zullinger <tmz at pobox.com>
Date:   Thu Jul 21 17:25:56 2011 -0400

    Merge branch 'master' into el6

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