Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 27 Sep 2011 01:48:24 +0000 (21:48 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 27 Sep 2011 01:48:24 +0000 (21:48 -0400)

Trivial merge