# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1317814830 -7200
# Node ID 5b3e3dc8fb4062b27386308f1335e9fe6c99c752
# Parent  afd146041cbd6281fe3bfbad07e7022e311146af# Parent  cf16b6560dd13f65ecf128e90a6fd9a6eba85b7d
merge from firefox7