Fix merge
authorRonan Le Martret <ronan@fridu.net>
Mon, 26 May 2014 12:06:34 +0000 (14:06 +0200)
committerRonan Le Martret <ronan@fridu.net>
Mon, 26 May 2014 12:06:34 +0000 (14:06 +0200)
commitf71f810e0b644c39568677573ea7266d8cecf348
tree873ad4ad7f1b1405f1e2d479e71255b2dcf9afcf
parent7b2ac47725ef5dbe898c72c91c2dcfcd52233ba2
parentaf7a2fdbb83289a172da97b47941227dd7e786c4
Fix merge

Change-Id: I39926b229313a02f27ffc12f0e0a5a691fc972ae
proto-meta-Tizen_generic/.spec2yoctorc