Including TMT services (probably previous commit failed, or I forgot to commit these changes).
Authored by: ounos 2010-04-20
Parent: [r1166]
Child: [r1168]