Ringlocker: clean up and changed radius
Merge branch 'gingerbread' into gingerbread-cooperve