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

[Todd Zullinger]

commit d53b043336ff272e024d16c8c5b9cde494152421
Merge: 1e01c77 0232b17
Author: Todd Zullinger <tmz at pobox.com>
Date:   Fri Jul 22 01:57:31 2011 -0400

    Merge branch 'master' into el5

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