[oprofile/f13: 2/2] Merge branch 'master' into f13

[William Eden Cohen]

commit 0843e80e55a93487b4fb070a5a62c340071f67a7
Merge: 2a887f6 f4379f0
Author: William Cohen <wcohen at redhat.com>
Date:   Tue Jun 7 16:56:58 2011 -0400

    Merge branch 'master' into f13

 oprofile-opcontrol.patch |  325 ++++++++++++++++++++++++++++++++++++++++++++++
 oprofile.spec            |    7 +-
 2 files changed, 331 insertions(+), 1 deletions(-)
---