Merge rsa/tizen_2.2 into rsa/master
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Mon, 12 Aug 2013 08:39:31 +0000 (10:39 +0200)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Mon, 12 Aug 2013 08:39:31 +0000 (10:39 +0200)
Change-Id: I5659d92a2f8b5ea3dff28b4405fb0bd0ac7e1176


Trivial merge