Merge branch 'more-unused-39231'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 21 Sep 2011 10:45:12 +0000 (11:45 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 21 Sep 2011 10:45:13 +0000 (11:45 +0100)
commitb3b9fc03da4b7de2056edff25af030b9f4bd8063
tree092badfbdf0bddcb381ddb72c7eb80fd09ed2d49
parent44f2531016e55e3dbfea3bcb60ba9f679f7d4b87
parent2829a59951304d11df0483e74ba1acdf25d50acc
Merge branch 'more-unused-39231'

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39231
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
bus/activation.c