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

[Nils Philippsen]

commit 835b8489e76b62e7d3834a433522856f72e2cf65
Merge: a332a40 16e7c41
Author: Nils Philippsen <nils at redhat.com>
Date:   Tue Aug 24 17:52:01 2010 +0200

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

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