Merge branch 'vendor/rxg' into chromium11 chromium11
authorMatthias Rampke <matthias@rampke.de>
Thu, 26 May 2011 19:18:57 +0000 (21:18 +0200)
committerMatthias Rampke <matthias@rampke.de>
Thu, 26 May 2011 19:18:57 +0000 (21:18 +0200)
commit019be1d68395d3e5c18f0ff00bd0265d95b780ec
treef51d80eb94cb7fec04da4888f97adebf4c43a1d2
parent30a3f4e088abee2c97ebccdf51b9a457e1b50a5a
parentd29f1788d1db0759435e663509d1ad54e989056d
Merge branch 'vendor/rxg' into chromium11

Conflicts:
Makefile