am 9cfc52d9: am 99e330b5: Merge "Properly fill in the component name for the...
am 9cfc52d9: am 99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo
Merge commit '9cfc52d9' into kraken
* commit '9cfc52d9':
Properly fill in the component name for the software decoders.