New upstream version. Rules cleanup, removing deprecated packages.
Authored by: andremachado 2010-04-22
Parent: [r930]
Child: [r932]
