It turns out I already made these fixes in another copy of this code...
in kdepim-runtime/resources/tomboynotes/o2 (although diff says that version
got auto-reformatted). Not sure how we can avoid this duplication though.

CCMAIL: metzpinguin@gmail.com