android 2.2
Merge branch 'bykongen'