libfreerdp: merging with master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 19 Sep 2012 19:55:41 +0000 (15:55 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 19 Sep 2012 19:55:41 +0000 (15:55 -0400)

Trivial merge