Merge remote-tracking branch 'busybox_net/master' into gingerbread