K 10
svn:author
V 4
ahze
K 8
svn:date
V 27
2005-01-14T02:31:48.000000Z
K 7
svn:log
V 129
- Remove forgotten conflicting patch.
- Actually merge a missing patch from firefox.

Pointed out by:	many
Pointy hat to:	myself

END