The following commit has been merged in the master branch: commit 4bc9fbcf4ae60ad39db1ac34b4186bd9bfa7b103 Merge: 8be58f3df9b382960c53bdf794db10bc6faced51 f1a6776979513a054a6e5512f7aca3df68e37cc3 Author: Stephen Kitt <steve@sk2.org> Date: Tue Jun 12 07:19:21 2012 +0200 Merge branch 'wine-gecko-1.4' Conflicts: debian/rules -- Debian Wine Gecko packaging