添加注释
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	src/org/equinoxosgi/toast/Airbag.java
	src/org/equinoxosgi/toast/Gps.java