[libstatgrab/f19: 6/6] Merge branch 'master' into f19

[Christopher Meng]

commit d6a15c1058e18bf9c3ecf0e9ce9c87c09ef91e7c
Merge: 5c2cb75 73156ac
Author: Koji <koji at fedoraproject.org>
Date:   Fri Aug 16 17:50:39 2013 +0800

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

 libstatgrab.nochmod.patch |   52 -------------------
 libstatgrab.spec          |  122 +++++++++++++++++++-------------------------
 2 files changed, 53 insertions(+), 121 deletions(-)
---