Merge proposals dependent on lp://qastaging/~kamstrup/libunity/fixes-2011-09-15

lp://qastaging/~kamstrup/libunity/fixes-2011-09-15 has no merge proposals.