Merge proposals dependent on lp://qastaging/~unity-team/unity/fixes-2011-03-28

lp://qastaging/~unity-team/unity/fixes-2011-03-28 has no merge proposals.