Merge proposals dependent on lp:~udsmprogrammers/udsm2011/2.4

lp:~udsmprogrammers/udsm2011/2.4 has no merge proposals.