auto upload Thu Jan  3 13:47:10 PST 2013
Merge branch 'master' of github.com:idano/home