[libupnp/el6: 5/5] Merge branch 'master' into el6

[Matej Cepl]

commit dd465c3ac7c60afba4467c6112406872f4bbf8ca
Merge: a3089d5 1502ff2
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Jul 6 14:25:50 2011 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 libupnp.spec |   11 ++++++++---
 sources      |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)
---