dist.140315-b637523
Merge branch 'dist.140315-b637523' into dist
update tags
Merge branch 'f.doc' into rc
Merge branch 'rc'
dist.140315-2224413
Merge branch 'dist.140315-2224413' into dist