Merge github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 29 Apr 2013 18:05:21 +0000 (14:05 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 29 Apr 2013 18:05:21 +0000 (14:05 -0400)

Trivial merge