am 9fbeed7c: am 7507929d: Merge "Fix Copyright Headers" into froyo

Merge commit '9fbeed7c17c1156ea66b4f03caf900daadd98732' into gingerbread

* commit '9fbeed7c17c1156ea66b4f03caf900daadd98732':
  Fix Copyright Headers