Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 1 Oct 2013 16:03:32 +0000 (12:03 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 1 Oct 2013 16:03:32 +0000 (12:03 -0400)

Trivial merge