Merge branch 'Teaman-IPTraffic' into Teaman-ND
commitdc10f96124bde9d974f080e898b0368d5cb8bf9a
authorAugusto Bott <augusto@bott.com.br>
Sat, 17 Dec 2011 14:29:54 +0000 (17 12:29 -0200)
committerAugusto Bott <augusto@bott.com.br>
Sat, 17 Dec 2011 14:29:54 +0000 (17 12:29 -0200)
tree336aea0b0446c63edbac2b5a60acce6304554cf5
parent95c89e42dda2d26040535d6f18f6b954f7a87c63
parent1b370b7977de578b17448488fc7275b6bb520676
Merge branch 'Teaman-IPTraffic' into Teaman-ND

* Teaman-IPTraffic:
  cstats/rstats: wait any helper processes complete at service shutdown
release/src/router/rc/services.c