tree b55a533b376d129084d7b16388ca61509f447471
parent 0eb3d447032461bac14439fd6e97b645cd45c231
parent 5287c4a600d5b69fe647876ecab3e29042c733e0
author JArod <jarodwen@gmail.com> 1370445519 -0700
committer JArod <jarodwen@gmail.com> 1370445519 -0700

merged back master to jarodwen/hotfix/issue461