Merge branch 'master' of github.com:FreeRDP/FreeRDP-1.0
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 25 Jul 2011 20:54:24 +0000 (16:54 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 25 Jul 2011 20:54:24 +0000 (16:54 -0400)

Trivial merge