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

[Todd Zullinger]

commit 4f0274396704c4ff8fc470a07b2f3dbf79825a00
Merge: 9b5069b 0232b17
Author: Todd Zullinger <tmz at pobox.com>
Date:   Fri Jul 22 01:57:24 2011 -0400

    Merge branch 'master' into el6

 sources |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---