Merge proposals dependent on lp://qastaging/~ceefour/tomboy/portable-fixes

lp://qastaging/~ceefour/tomboy/portable-fixes has no merge proposals.