Merge branch 'develop' into tizen_2.2
authordonghyuk.yang <donghyuk.yang@samsung.com>
Wed, 12 Jun 2013 09:21:47 +0000 (18:21 +0900)
committerdonghyuk.yang <donghyuk.yang@samsung.com>
Wed, 12 Jun 2013 09:21:47 +0000 (18:21 +0900)
commite0e34f4c906f067958db011b99f8ca8cdf2aa847
tree28e3a76e9ef3dc795b336a162b704fb0c2a6ad7a
parent3c9f845146f21f53da3a276e313315e53e472a9d
parent9a51765fcb489086e43494fa2f63c1957a2f333e
Merge branch 'develop' into tizen_2.2

Conflicts:
package/changelog
package/pkginfo.manifest
xml/linux/gcc45obs.armel.platform.xml
xml/linux/gcc45obs.i386.platform.xml