Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 27 Feb 2012 16:58:42 +0000 (11:58 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 27 Feb 2012 16:58:42 +0000 (11:58 -0500)

Trivial merge