[python-bunch: 5/5] Merge branch 'el5'

[Toshio くらとみ]

commit 9917fd7646bb983a96a82a62c35fc0829451497c
Merge: ec429ef eaece1b
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Sep 1 17:01:55 2010 -0400

    Merge branch 'el5'
    
    Conflicts:
    	python-bunch.spec

 python-bunch.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---