Merge branch 'master' of github.com:eurogiciel-oss/meta-tizen
authorRonan Le Martret <ronan@fridu.net>
Tue, 13 May 2014 08:52:07 +0000 (10:52 +0200)
committerRonan Le Martret <ronan@fridu.net>
Tue, 13 May 2014 08:52:07 +0000 (10:52 +0200)
Conflicts:
recipes-tizen/librua/librua.inc

Change-Id: I1917809ca8d77c96f1704166fcc7248e895f02a0


Trivial merge