Mon Feb 11 08:56:47 MST 2013 - Added scheduled event to test
Merge branch 'master', remote branch 'origin/master'