[mcs/f13/master: 4/4] Merge branch 'master' into f13

[Michael Schwendt]

commit b3f17adc7eba6e0b37f4b4ba66fab7363fdd553c
Merge: a7a80f1 fed9ecb
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Jan 20 15:09:07 2011 +0100

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                               |    1 -
 dead.package                             |    2 +
 libmcs-0.7.1-keyfile-change-string.patch |   12 --
 libmcs-0.7.1-sysconfdir.patch            |   19 ---
 libmcs-0.7.1-util.patch                  |   70 -----------
 libmcs-0.7.1-walk.patch                  |   23 ----
 mcs.spec                                 |  196 ------------------------------
 sources                                  |    1 -
 8 files changed, 2 insertions(+), 322 deletions(-)
---