tree b3d2e5fde622c14855f724666f5b20a4426e8541
parent 3aeae310d55ea92b0d5dc358aa1c547a6ec1714d
author Scott Baker <smbaker@gmail.com> 1399678933 -0700
committer Scott Baker <smbaker@gmail.com> 1399678933 -0700

merge changes from opencloud.dp on demo