Merge branch 'master' of github.com:FreeRDP/FreeRDP-1.0
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 7 Jul 2011 14:33:46 +0000 (10:33 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 7 Jul 2011 14:33:46 +0000 (10:33 -0400)

Trivial merge