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

[William Eden Cohen]

commit 2a887f6913eb5b03ed380f003d8192296c657f48
Merge: c2870c4 7fd4ba6
Author: William Cohen <wcohen at redhat.com>
Date:   Thu Apr 7 11:34:41 2011 -0400

    Merge branch 'master' into f13

 ...ile-0.9.3-xen.patch => oprofile-0.9.5-xen.patch |  187 ++++++-----
 oprofile-qt4.patch                                 |  381 ++++++++++++++++++++
 oprofile.spec                                      |   45 ++-
 3 files changed, 516 insertions(+), 97 deletions(-)
---