Merge branch 'origin'

This commit is contained in:
Mauro Carvalho Chehab 2006-02-06 14:35:35 -02:00
commit fc3fba60f5