Merge from vendor branch TNF:
authorryoon <ryoon>
Tue, 8 Nov 2011 23:52:25 +0000 (23:52 +0000)
committerryoon <ryoon>
Tue, 8 Nov 2011 23:52:25 +0000 (23:52 +0000)
commit0b937712e4f17cbf186a136522c263bf880b0bce
tree276ad97c6bc5d53613c75e512327e4fa3ac90de2
parent1e4b964ef85b6659f072b17615ae0598cccf9b13
parent43df90264c6fd6a69635aad2648216582bf7f91e
Merge from vendor branch TNF:
Successor of net/umph