tree 304a5d2e6fe0351d878cf9ffe1bd40398984864f
parent 2b043a69b43221f1ce23a22529598955aae762c6
parent f7e5ef65617f3f47e312905a1623853eaa4ea702
author Vinayak Borkar <vinayakb@gmail.com> 1369108007 -0700
committer Vinayak Borkar <vinayakb@gmail.com> 1369108007 -0700

Merge branch 'master' into vinayakb/resource_management