Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'
Merge branch 'shr'

Conflicts:
	meta-htc/README
	meta-nokia/README
	meta-openmoko/README
	meta-palm/README
	meta-samsung/README
README: use github mirror URLs
Merge branch 'shr'
Merge branch 'shr'
README: be consistent about branch names