tree 87c2a0f66ff08abad734fd67399a4c5932221490
parent 1f18bfa2d94f7132ce2dde74cc6b60618f6fe324
parent b46d5391b2ea348245245044b6bb19f71f6cb3ef
author Vinayak Borkar <vinayakb@gmail.com> 1369887289 -0700
committer Vinayak Borkar <vinayakb@gmail.com> 1369887289 -0700

Merge branch 'master' into vinayakb/resource_management