Merge rsa/tizen_2.1 into rsa/master
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Tue, 4 Jun 2013 14:51:43 +0000 (16:51 +0200)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Tue, 4 Jun 2013 15:01:22 +0000 (17:01 +0200)
Change-Id: I360ecefb2596ddf47955b2dd9234af5374ba700b


Trivial merge