Merge branch 'master' into trunk
Merge branch 'master' into trunk
fix function3
Merge branch 'release_20130822_bugfix' into release_20130822
Merge branch 'release_20130822' into trunk
Merge branch 'trunk'