Merge proposals dependent on lp:~xiphos-devel/xiphos/trunk

lp:~xiphos-devel/xiphos/trunk has no merge proposals.