tree a31ed52c124f8a1cf558fcd96efae7de75703d1c
parent 5c2073451fdf4aa16e0118ec292c7591f0a2c0f7
parent 7850cb3eb456c842e1ffa8bcd0bfa5e4b2c49ecb
author ramangrover29 <ramangrover29@gmail.com> 1369444486 -0700
committer ramangrover29 <ramangrover29@gmail.com> 1369444486 -0700

merged master into dependency branch, resolving all conflicts and  made it compatible with hyracks master