[gprof2dot/el6: 10/10] Merge branch 'master' into el6

[Toshio くらとみ]

commit 839987c27cbd25565d3e55dd551924e1ce6c30e1
Merge: a8be375 64f5b52
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Jul 20 12:10:34 2012 -0700

    Merge branch 'master' into el6
    
    Conflicts:
    	gprof2dot.spec
    	sources

 gprof2dot.spec |   24 ++++++++++++++++++------
 sources        |    2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)
---