Merge branch 'master' of git://github.com/gritzko/swift

Conflicts:
	sendrecv.cpp

diff --cc sendrecv.cpp
index 04d8d12e81b28d6af768083f8a9ca34f18c87017,9f74a2a155f162520366cc4a2daa8b425923b979..71180d9e9256b5e7e940988bd09873cceb2f13b1
--- 1/sendrecv.cpp
--- 2/sendrecv.cpp
+++ b/sendrecv.cpp
@@@ -183,11 -183,10 +183,11 @@@ bin64_t        Channel::AddData (Datagr
          return bin64_t::NONE;
      
      bin64_t tosend = bin64_t::NONE;
 -    if (data_out_.size()<cwnd_ && last_data_out_time_<=NOW-send_interval_) {
 +    tint luft = send_interval_>>2; // may wake up a bit earlier
 +    if (data_out_.size()<cwnd_ && last_data_out_time_+send_interval_+luft<=NOW) {
          tosend = DequeueHint();
          if (tosend==bin64_t::NONE) {
-             dprintf("%s #%u no idea what to send #sendctrl\n",tintstr(),id_);
+             dprintf("%s #%u sendctrl no idea what to send\n",tintstr(),id_);
              if (send_control_!=KEEP_ALIVE_CONTROL)
                  SwitchSendControl(KEEP_ALIVE_CONTROL);
          }