Merge remote-tracking branch 'alban/own_prefix2'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 27 Mar 2012 14:05:51 +0000 (15:05 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 27 Mar 2012 14:05:56 +0000 (15:05 +0100)
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46273


Trivial merge