Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 23 Jul 2013 23:21:39 +0000 (19:21 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 23 Jul 2013 23:21:39 +0000 (19:21 -0400)

Trivial merge