Merge branch 'output-hotplug' of git://people.freedesktop.org/~bnf/wayland-demos
authorKristian Høgsberg <krh@bitplanet.net>
Tue, 10 Apr 2012 17:05:11 +0000 (13:05 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 10 Apr 2012 17:05:11 +0000 (13:05 -0400)

Trivial merge