Merge branch 'master' of git://projetos.ossystems.com.br/git/users/otavio/org.openemb...

* 'master' of git://projetos.ossystems.com.br/git/users/otavio/org.openembedded.dev:
  flash-plugin: add 10.0.12.36
  sun-jre6: add 1.6.0.10
  parted: drop versions up to 1.8.8
  package.bbclass, package_ipk.bbclass: add dynamic depends on locale packages (ipk specific)
  cups: add 1.3.8.
  rt61-firmware: add 1.2

diff --cc conf/bitbake.conf
Simple merge

diff --cc conf/checksums.ini
Simple merge