Merged r6006 from trunk.
scm: code clean up abstract adapter.
Authored by: tmaruyama 2011-06-08
Parent: [r6007]
Child: [r6009]