Merge branch 'master' into task/slp/release
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 21 Dec 2012 03:51:26 +0000 (12:51 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 21 Dec 2012 03:51:26 +0000 (12:51 +0900)
commit0381b243d165585d4d690523745c008bfd960387
tree6a60d626267ecb0e36da407ab5c5ffd9bc62348d
parent76a3c7e4ef612b2cd129d07ee79222ff8fc1c1f8
parent2a21a0612b79c3736a683aa645665d11b548feef
Merge branch 'master' into task/slp/release