Merged changes r1146 with some changes
Authored by: ctapmex 2009-12-03
Parent: [r1155]
Child: [r1157]