Merge branch 'origin'

This commit is contained in:
Mauro Carvalho Chehab 2006-02-07 08:11:05 -02:00
commit dece696076
20 changed files with 278 additions and 236 deletions