From: Keith Packard <keithp@keithp.com>
Date: Fri, 4 Oct 2013 21:04:48 +0000 (-0700)
Subject: Merge remote-tracking branch 'anholt/ephyr-fixes'
X-Git-Tag: xorg-server-1.14.99.2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3b529bf25db2700addbafc7aa4fc5b126ba9929;p=platform%2Fupstream%2Fxorg-server.git

Merge remote-tracking branch 'anholt/ephyr-fixes'
---

f3b529bf25db2700addbafc7aa4fc5b126ba9929