Updates I forgot to commit yesterday...
Authored by: fer_perez 2007-12-04
Parent: [r4580]
Child: [r4582]