[satyr/el6: 6/6] Merge branch 'master' into f19

[Martin Milata]

commit 3ea927177fe422d2a228895436aceed999f86b4a
Merge: ad0569f 0293121
Author: Martin Milata <mmilata at redhat.com>
Date:   Fri Jul 26 12:06:01 2013 +0200

    Merge branch 'master' into f19
    
    Conflicts:
    	satyr.spec

 satyr.spec |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---