Merge branch 'egfx' of github.com:awakecoding/FreeRDP into shadow
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 13 Sep 2014 16:04:02 +0000 (12:04 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 13 Sep 2014 16:04:02 +0000 (12:04 -0400)

Trivial merge