Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus
authorkos <kos@dev3>
Fri, 25 Jan 2013 10:07:51 +0000 (19:07 +0900)
committerkos <kos@dev3>
Fri, 25 Jan 2013 10:07:51 +0000 (19:07 +0900)
commit0761571c7ca12b7297da129697aeee583a468174
tree096316766b19670826a598ef00343407645d1ff3
parent6088778ef01fd47bfb61658ab266ce23dcd680ed
parenta4d060a67abdd40b960df45bed6d1eff06291c7c
Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus

Conflicts:
meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig
meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend