auto upload Sat Jan  5 11:05:01 PST 2013
Merge branch 'master' of github.com:idano/home