tree e255edcc012fe078f82a28ee95511362f8bac958
parent 92c9a4d624af61a2434daff416a2dae0edc6823e
parent 9812ffb9980a7ed7c3512873d522ac6ee5f52742
author sleepsonthefloor <sleepsonthefloor@gmail.com> 1320692575 -0800
committer sleepsonthefloor <sleepsonthefloor@gmail.com> 1320692575 -0800

Merge pull request #167 from cloudbuilders/trunk-fixes

make some changes prepping for trunk branch