Bug 925068: Bookmarks folders are lost on rotation. [r=lucasr]

--HG--
extra : rebase_source : 0337903f40ba0ead258d66730e9dc10622b5673c