merge with BZR web-addons