Merged with freerdp/master
authorMartin Fleisz <mfleisz@thinstuff.at>
Fri, 22 Feb 2013 12:31:57 +0000 (04:31 -0800)
committerMartin Fleisz <mfleisz@thinstuff.at>
Fri, 22 Feb 2013 12:31:57 +0000 (04:31 -0800)

Trivial merge