[lbzip2/el5: 11/11] Merge branch 'master' into el5

[lzap]

commit fae59650b6158081849b23cca848150699dd005f
Merge: 28aa74b fce9c0d
Author: Laszlo Ersek <lersek at redhat.com>
Date:   Fri Aug 17 23:03:48 2012 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	lbzip2-makefile.patch
    	lbzip2.spec

 .gitignore            |    4 ++
 lbzip2-lfs.patch      |   15 --------
 lbzip2-makefile.patch |   48 --------------------------
 lbzip2.spec           |   90 +++++++++++++++++++++++-------------------------
 sources               |    2 +-
 5 files changed, 48 insertions(+), 111 deletions(-)
---