Merge commit 'v2.6.36' into oprofile/core