[php-pecl-lzf/el5: 11/11] Merge branch 'master' into el5

[topdog]

commit 511ebd05c27d2f11dc8cc43291d6f19638183fcf
Merge: aaf8a9b d068763
Author: Andrew Colin Kissa <andrew at topdog.za.net>
Date:   Sun Oct 21 01:20:09 2012 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore

 .gitignore                    |    2 +-
 php-lzf-rm-bundled-libs.patch |  585 +++++++++++++++++++++++++++++++++++++++++
 php-pecl-lzf.spec             |   71 ++++-
 sources                       |    2 +-
 4 files changed, 643 insertions(+), 17 deletions(-)
---