Merge branch 'setup_display' of git://anongit.freedesktop.org/~bnf/wayland
authorKristian Høgsberg <krh@bitplanet.net>
Tue, 1 Mar 2011 22:04:33 +0000 (17:04 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 1 Mar 2011 22:04:33 +0000 (17:04 -0500)

Trivial merge