auto upload Fri Jan  4 16:40:14 PST 2013
Merge branch 'master' of github.com:idano/home