Merge proposals dependent on lp://qastaging/~unity-team/unity/fixes-2011-04-11

lp://qastaging/~unity-team/unity/fixes-2011-04-11 has no merge proposals.