Merge remote-tracking branch 'rsa/tizen_2.1' into rsa_master
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Wed, 17 Apr 2013 10:23:58 +0000 (12:23 +0200)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Wed, 17 Apr 2013 10:23:58 +0000 (12:23 +0200)

Trivial merge