Merge branch 'arg0namespace-24317'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 7 Apr 2011 16:16:01 +0000 (17:16 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 7 Apr 2011 16:16:24 +0000 (17:16 +0100)
commit74072479a05dbf9208a5f92495e7eb32f471428c
tree68bcfacfada594fbbfb056607c9d7ba39c6c99ff
parentc99ead074a5c0917716c28c2ff1dc2e0c74a1b53
parentf15c6d66ca73d3fbee77118b94f1a5617e3577a2
Merge branch 'arg0namespace-24317'

Reviewed-by: David Zeuthen <davidz@redhat.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=24317
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=31818
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34870