[python-debian/el6/master: 4/4] Merge branch 'master' into el6

[Miroslav Suchý]

commit 9f8579b8988fc6457f740f321d52f6321ba6ec80
Merge: 9cbcbf7 8ddc7d6
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Thu Dec 9 08:57:59 2010 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	python-debian.spec

 python-debian.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---