Merge branch 'master' of github.com:jsorg71/FreeRDP-A8
authorJay Sorg <jay.sorg@gmail.com>
Wed, 25 Jul 2012 22:27:34 +0000 (15:27 -0700)
committerJay Sorg <jay.sorg@gmail.com>
Wed, 25 Jul 2012 22:27:34 +0000 (15:27 -0700)

Trivial merge