Merge branch 'master' into svc
authorVic Lee <llyzs@163.com>
Wed, 3 Aug 2011 06:16:44 +0000 (14:16 +0800)
committerVic Lee <llyzs@163.com>
Wed, 3 Aug 2011 06:16:44 +0000 (14:16 +0800)
commitd0c0bca997e13966103997d618741a8b56d25c62
treeef9731a290bd6fa2022eddeb1613598d83d44ddd
parent1162a6244be1c03ccaadd61c0ca56ed0db1c6348
parentb4437a783c7024fbb12011fe5bd17c1c7302c0c3
Merge branch 'master' into svc

Conflicts:
client/DirectFB/dfreerdp.c
client/DirectFB/dfreerdp.c