Merge branch 'master' of git@github.com:jsorg71/FreeRDP-1.0
authorJay Sorg <jay.sorg@gmail.com>
Mon, 5 Sep 2011 07:14:04 +0000 (00:14 -0700)
committerJay Sorg <jay.sorg@gmail.com>
Mon, 5 Sep 2011 07:14:04 +0000 (00:14 -0700)

Trivial merge