auto upload Sat Jan  5 10:40:59 PST 2013
Merge branch 'master' of github.com:idano/home