# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1317024470 -7200
# Node ID afd146041cbd6281fe3bfbad07e7022e311146af
# Parent  a93d6492e93af6bb52473585e2ccfe1ea5b4ce72# Parent  1256d88428728f9b5b262a8475199eea92f22960
merge firefox7 to default