Merge branch 'develop' into tizen_2.2
authordonghyuk.yang <donghyuk.yang@samsung.com>
Mon, 17 Jun 2013 06:17:19 +0000 (15:17 +0900)
committerdonghyuk.yang <donghyuk.yang@samsung.com>
Mon, 17 Jun 2013 06:17:19 +0000 (15:17 +0900)
commitca7384a50fe011b156ce0aa6a862e6531b30ca1c
tree547247066b48c505e601de8cf5783664475efcbf
parent1cabc73acf2e474dfc471874efc878d5e980cd08
parentb4123102283a2cec57f13b83555a3ae38631ead3
Merge branch 'develop' into tizen_2.2

Conflicts:
xml/linux/gcc45obs.armel.platform.xml
xml/linux/gcc45obs.i386.platform.xml