[sigar/f16: 3/3] Merge branch 'master' into f16

[Zane Bitter]

commit dacce383bbe16be53691aa14c71b9aa4ea764ee4
Merge: a9211d5 f4df965
Author: Zane Bitter <zbitter at redhat.com>
Date:   Fri Oct 21 17:13:16 2011 +0200

    Merge branch 'master' into f16
    
    Conflicts:
    	sigar.spec

 bz746288-1-cpu-count-arch.patch |   74 +++++++++++++++++++++++++++++++++++++++
 sigar.spec                      |    7 +++-
 2 files changed, 80 insertions(+), 1 deletions(-)
---