Merge commit 'v2.6.30' into oprofile/master