Merge branch 'smartcard' of github.com:awakecoding/FreeRDP into smartcard
authorawake <awake@ubuntu.(none)>
Sat, 26 Apr 2014 01:45:40 +0000 (18:45 -0700)
committerawake <awake@ubuntu.(none)>
Sat, 26 Apr 2014 01:45:40 +0000 (18:45 -0700)

Trivial merge