Merge from vendor branch TNF:
authorsborrill <sborrill>
Fri, 4 Jun 2010 16:07:51 +0000 (16:07 +0000)
committersborrill <sborrill>
Fri, 4 Jun 2010 16:07:51 +0000 (16:07 +0000)
commit4b1baaa035bbb6f1b3da5f2a1a011064482433b8
treeb21f1096c7da77dc5271ab3d15523c6f638ebbdb
parentf4e227924ef055f5680c059ec1135cc5e797b4c2
parentdc2cdc02a245bf8ea32e8ce8fe515fd59b6680ec
Merge from vendor branch TNF:
Move from devel to net