---- merge with HEAD user: Liu Jian<liujatp at gmail.com> files: src/process/process-manager.cc src/process/process-manager.h src/process/wscript src/wscript url: http://code.nsnam.org/lj/quagga-porting/rev/88a3f87cb7de