Merge from vendor branch TNF:
authordrochner <drochner>
Mon, 26 Jul 2010 11:54:34 +0000 (11:54 +0000)
committerdrochner <drochner>
Mon, 26 Jul 2010 11:54:34 +0000 (11:54 +0000)
commit9d4bbdb81ec8a772bef84f7c915f46c29ac2bc5c
treea9ea5460953c6dccf17727039f987fa39539b2bf
parent9dbfcd6bed0002290740bd35e3d21f58f5614e93
parent39a321e0e6e14199b5abd56250977703032cbd95
Merge from vendor branch TNF:
oops - too much c&p - reimport into proper path