[pinfo/f13/master: 3/3] Merge branch 'master' into f13

[Miroslav Lichvar]

commit 927c505b6aa3a4a5a36ea1fb4dcccf43cf6058ef
Merge: 3d8865e a44f67e
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Tue Sep 21 16:04:03 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore |    2 +-
 pinfo.spec |   11 ++++++++---
 sources    |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---