auto upload Fri Jan  4 20:48:43 PST 2013
Merge branch 'master' of github.com:idano/home