auto upload Wed Jan  2 21:48:47 PST 2013
Merge branch 'master' of github.com:idano/home