Merge remote-tracking branch 'rsa/tizen_2.1' into rsa_master
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Fri, 29 Mar 2013 10:17:37 +0000 (11:17 +0100)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Fri, 29 Mar 2013 10:17:37 +0000 (11:17 +0100)

Trivial merge