From: Keith Packard <keithp@keithp.com>
Date: Thu, 10 Apr 2014 04:59:17 +0000 (-0700)
Subject: Merge remote-tracking branch 'jeremyhu/master'
X-Git-Tag: upstream/1.16~131
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3028ae6c9aa37168e249e0d847b29f8e3efb05b2;p=platform%2Fupstream%2Fxorg-server.git

Merge remote-tracking branch 'jeremyhu/master'
---

3028ae6c9aa37168e249e0d847b29f8e3efb05b2