Merge branches 'barrier.2012.05.01a', 'fixes.2012.04.26a', 'inline.2012.05.02b' and 'srcu.2012.04.30a' into dev3.5-2012.05.02b