[pbzip2/el6: 8/9] Merge branch 'master' into el6

[Ville Skyttä]

commit 3b817e4e2e79d3b0915aa04785cadc4f6105fe28
Merge: b515c5f 9a07281
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Jun 2 11:34:19 2012 +0300

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	pbzip2.spec
    	sources

 .gitignore                    |    2 +-
 pbzip2-1.1.6-buildflags.patch |   21 +++++++++++++++++++++
 pbzip2.spec                   |   23 ++++++++++++++++++-----
 sources                       |    2 +-
 4 files changed, 41 insertions(+), 7 deletions(-)
---