Merge branch 'master' of https://github.com/dpoe/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 19 Jan 2013 00:28:55 +0000 (19:28 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 19 Jan 2013 00:28:55 +0000 (19:28 -0500)

Trivial merge