merged commit between gingerbread and busybox/master 20110630

Change-Id: I61cea0a93e8366db367af24c113b955d9a769213