Merge branch ckm into tizen 62/38362/1
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Fri, 17 Apr 2015 13:37:00 +0000 (15:37 +0200)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Fri, 17 Apr 2015 13:37:55 +0000 (15:37 +0200)
Change-Id: I27c9ffe96224209920222f00756c762edf820e17


Trivial merge