[beefy-miracle-kde-theme/f18: 6/6] Merge branch 'f19' into f18

[Martin Briza]

commit fdcd35510625f71954ad18a9b4f0a09fdc3528f4
Merge: 3b4affc a3df58d
Author: Martin Briza <mbriza at redhat.com>
Date:   Tue Aug 13 16:27:25 2013 +0200

    Merge branch 'f19' into f18
    
    Conflicts:
    	beefy-miracle-kde-theme.spec

 .gitignore                   |    1 +
 beefy-miracle-kde-theme.spec |   20 +++++++++++++++-----
 sources                      |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
---