tree 21e17be44b5e876708526b4a8b610bc951689516
parent 0468d53f33f73a937a4390398963acecc19b952d
parent cf69ff42db7c3e6a15ee0fea4afba43c499ebde0
author ecarm002@ucr.edu <ecarm002@ucr.edu> 1382652573 -0700
committer ecarm002@ucr.edu <ecarm002@ucr.edu> 1382652573 -0700

Merged hyracks master back into VXQuery branch.