Merge branch 'trunk' of git://git.apache.org/pig into trunk
Merge branch 'trunk' of https://github.com/jcoveney/pig into trunk