port licence changes from trunk: r8806
Authored by: stephenbayliss 2010-09-24
Parent: [r8806]
Child: [r8808]