From: Marc-André Moreau <marcandre.moreau@gmail.com>
Date: Tue, 8 Jul 2014 16:20:30 +0000 (-0400)
Subject: Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx
X-Git-Tag: 1.2.0-beta1+android9~18^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a32c2e33e37e51c0febfd865e8fa2aeeccddb55;p=platform%2Fupstream%2Ffreerdp.git

Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx
---

1a32c2e33e37e51c0febfd865e8fa2aeeccddb55