[git/el5: 8/8] Merge branch 'master' into el5

[Todd Zullinger]

commit 81a4c6c16d1b31184f8e757d31e9f1d6c25a1bb0
Merge: bbd216e af4c4fa
Author: Todd Zullinger <tmz at pobox.com>
Date:   Mon Apr 15 16:10:04 2013 -0400

    Merge branch 'master' into el5

 ...STDIR-support-in-contrib-subtree-Makefile.patch |   32 -----------
 0001-Drop-DESTDIR-from-python-instlibdir.patch     |   29 ++++++++++
 git.spec                                           |   57 ++++++++++++++++----
 sources                                            |    6 +-
 4 files changed, 78 insertions(+), 46 deletions(-)
---