deleted:    .lock-waf_linux2_build
Merge branch 'nlsr-chrono' of github.com:NDN-Routing/NLSR0.0 into nlsr-chrono
added \#include <boost/thread/condition.hpp>

	modified:   sync-scheduler.h