[python-slip: 14/14] Merge branch 'master' into f12

[Nils Philippsen]

commit b90f97c08595a4bf3a7769d08704937b9a365b23
Merge: fa7d1d4 835b848
Author: Nils Philippsen <nils at redhat.com>
Date:   Tue Aug 24 17:53:06 2010 +0200

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	python-slip.spec
    	sources

 .gitignore       |    1 +
 python-slip.spec |    7 ++++++-
 sources          |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
---