[ingo/f13/master: 5/5] Merge branch 'master' into f13

[Nick Bebout]

commit ca568f228e4ac5fe405964634bc9437bf90d27f8
Merge: ad82d1b 1d889bd
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Feb 9 21:12:27 2011 +0000

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	ingo.spec
    	sources

 .gitignore |    1 +
 ingo.spec  |    8 +++++++-
 sources    |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---