Merge branch 'temp'
authorChangsun Lee <cs78.lee@samsung.com>
Tue, 15 Jan 2013 12:06:04 +0000 (21:06 +0900)
committerChangsun Lee <cs78.lee@samsung.com>
Tue, 15 Jan 2013 12:06:04 +0000 (21:06 +0900)
commit50fb2aac430a33ad629abf063feff108737269b1
tree419366cd72e3face80d30eeff8b1e865e06c8a46
parentaa536cbe0fb48ac1363728291593ccf75f5e98a4
parent055df8c81747e6e5c5478cffb9a3f6be79f01df1
Merge branch 'temp'

Conflicts:
packaging/org.tizen.video-player.spec

Change-Id: I643d83b504a1c8cad2d9b85bc41f6acc90f8d9ca