AutoCommit: 2014-05-14 15:46:56.157829
Initial checkin.
AutoCommit: 2014-05-14 19:12:11.589616
Merge branch 'master' into smp