Merge branch 'master' of github.com:FreeRDP/FreeRDP into cleanup
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 25 Aug 2012 15:54:36 +0000 (11:54 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 25 Aug 2012 15:54:36 +0000 (11:54 -0400)

Trivial merge