Merge proposals dependent on lp:~davewalker/ubuntu/oneiric/diff-ext/831230

lp:~davewalker/ubuntu/oneiric/diff-ext/831230 has no merge proposals.