Merge branch 'master' of github.com:FreeRDP/FreeRDP-1.0
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 8 Jul 2011 19:32:18 +0000 (15:32 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 8 Jul 2011 19:32:18 +0000 (15:32 -0400)

Trivial merge