Bug 908344 - Test for bookmark keyword. r=wesj
Bug 908344 - Fix bookmark keywords. r=wesj