Merge remote-tracking branch 'rsa/develop' into tizen
authordonghee yang <donghee.yang@samsung.com>
Tue, 8 Oct 2013 06:02:41 +0000 (15:02 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Tue, 8 Oct 2013 06:02:41 +0000 (15:02 +0900)
commit1115e3251a9d63a486c9affae8a81b992665fa12
tree970d81599c44848de690605f8b0433fabf429b3a
parent68b763dc6d96d3bb2c6d9f3ed5bb4210f026f2b4
parented97ea5264e54ee9dcb994ca20d787220b00f694
Merge remote-tracking branch 'rsa/develop' into tizen

Conflicts:
package/changelog
package/changelog