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)
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39231
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
1  2 
bus/activation.c

Simple merge