tree e0c6e02c89aa9227726c9469da1001b3e29c41df
parent c5c31e2aeaedbdf76e1f38d3c385e34f5ed875ca
author Armin Le Grand <alg@apache.org> 1405364951 +0000
committer Armin Le Grand <alg@apache.org> 1405364951 +0000

Resync to trunk, windows non-pro build