auto upload Thu Jan  3 20:19:04 PST 2013
Merge branch 'master' of github.com:idano/home