Merge branch 'master' of github.com:FreeRDP/FreeRDP into smartcard
authorawake <awake@ubuntu.(none)>
Wed, 16 Apr 2014 21:18:32 +0000 (14:18 -0700)
committerawake <awake@ubuntu.(none)>
Wed, 16 Apr 2014 21:18:32 +0000 (14:18 -0700)

Trivial merge