Merge branch 'update-display-name-603463'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 3 Mar 2010 10:54:57 +0000 (11:54 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 3 Mar 2010 10:54:57 +0000 (11:54 +0100)
commit4728aaffa21812eb2e6bd8b9eeac0cceccb85437
treec752552504d39cf40be8f54167888ccd54fdfa17
parent46adf4f15f0d9fee5b3b2e22e2cffca0d48a7184
parent1dab11523a8fffd546d154ca21c79a8c76d0c3c0
Merge branch 'update-display-name-603463'