Restore trunk from stable1-2 branch.

Files:
copied: from /branches/stable_1-2 (r1017) to /trunk (try)
copied: from /branches/stable_1-2/ext (r1019) to /trunk/ext (try)