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

[lzap]

commit 2e6722f1b354e133f911eaeef6c35c95994d57b6
Merge: 6f8b7d6 fce9c0d
Author: Laszlo Ersek <lersek at redhat.com>
Date:   Fri Aug 17 23:08:57 2012 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	lbzip2.spec

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