Merge proposals dependent on lp:~danielholm/twitpicgtk/trunk

lp:~danielholm/twitpicgtk/trunk has no merge proposals.