Merge branch 'nice-kakaroto' of git+ssh://dhansak.collabora.co.uk/home/kakaroto/git...
commite9444e9b220c7cc4c12b36b090e521b059f0e215
authorOlivier Crête <olivier.crete@collabora.co.uk>
Fri, 2 May 2008 00:44:00 +0000 (1 20:44 -0400)
committerOlivier Crête <olivier.crete@collabora.co.uk>
Fri, 2 May 2008 00:44:00 +0000 (1 20:44 -0400)
treec5a901c69d619e8d4d81311670acc0690e30820d
parent549fe7164859de2a4898b84c1fbad03b851f2be6
parent1e2acd57c503ba438e92c5429e8a4bf87578e106
Merge branch 'nice-kakaroto' of git+ssh://dhansak.collabora.co.uk/home/kakaroto/git/nice into nice-tester-2