tree d63b5f3fb262951861ddc4e84be6c1573050b811
parent 263ddb0b16b128033704a3cf74ae868890ed36ac
parent b43b76298d87880c6a738d5238c094e8acfdc7b4
author Vinayak Borkar <vinayakb@gmail.com> 1369759701 -0700
committer Vinayak Borkar <vinayakb@gmail.com> 1369759701 -0700

Merge branch 'master' into vinayakb/resource_management