Merge branch 'wrt-devel' of ssh://5.39.65.177/home/yoctotizen/yocto/yoctoTizen into...
authorRonan Le Martret <ronan@fridu.net>
Tue, 3 Sep 2013 13:50:01 +0000 (15:50 +0200)
committerRonan Le Martret <ronan@fridu.net>
Tue, 3 Sep 2013 13:50:01 +0000 (15:50 +0200)
Conflicts:
meta-wrt-tizen/conf/layer.conf


Trivial merge