Merge branch 'master' of https://github.com/awakecoding/FreeRDP
authorC-o-r-E <can.of.tuna@gmail.com>
Wed, 14 Nov 2012 15:37:03 +0000 (10:37 -0500)
committerC-o-r-E <can.of.tuna@gmail.com>
Wed, 14 Nov 2012 15:37:03 +0000 (10:37 -0500)

Trivial merge