merge trunk rev : 25656 to 0.3.1 branch - fixing my rmap problem in vmware
drwxr-xr-x - irc
drwxr-xr-x - reactos
drwxr-xr-x - rosapps