Merge branch 'atomic'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 11 Oct 2007 16:24:16 +0000 (17:24 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 11 Oct 2007 16:24:16 +0000 (17:24 +0100)
commitd229e579a314c6b893e0a92730f0bf644b4eabcd
tree8af2e1f9f8104a12517ac8e079e79048e9f72cb2
parent48ad73fd5bbb77bbcbb6fa9dae50454784654374
parent176738f0f0f57de3f4c8553a411b26b171fdd117
Merge branch 'atomic'

Conflicts:

ChangeLog
ChangeLog