merge revs 10118:10121 into 3.4
treedce7f302d4544f2410e516638d38e76c064af71a
-rw-r--r-- 2098 AUTHORS
-rw-r--r-- 35147 COPYING
-rw-r--r-- 510 README IPHONE
-rw-r--r-- 10435 README LINUX
-rw-r--r-- 3979 README OS X
-rw-r--r-- 8214 README WINDOWS
-rw-r--r-- 70 VERSION
drwxr-xr-x - common
drwxr-xr-x - editors
drwxr-xr-x - iphone
drwxr-xr-x - linux
drwxr-xr-x - mac
drwxr-xr-x - windows