Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 8 Jul 2014 16:20:30 +0000 (12:20 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 8 Jul 2014 16:20:30 +0000 (12:20 -0400)

Trivial merge