Merge remote-tracking branch 'rsa/tizen_2.2' into tizen accepted/tizen/20131014.132013 accepted/tizen/20131014.170403 accepted/tizen/20131014.182805 submit/tizen/20131014.114835 submit/tizen/20131014.115253
authorHoseon LEE <hoseon46.lee@samsung.com>
Mon, 14 Oct 2013 10:49:09 +0000 (19:49 +0900)
committerHoseon LEE <hoseon46.lee@samsung.com>
Mon, 14 Oct 2013 10:49:15 +0000 (19:49 +0900)
commitdbec08fe45b6a104ed45c3dcf1294ff96aa92973
tree558f3b7613ddb190ceb87f98f4a913c8ccdf717d
parent05f1e242a1915179ba9987bc24d51b4c20678172
parentc5c6d22f263ae8b2e7fc1b1b1c1365710cbd008c
Merge remote-tracking branch 'rsa/tizen_2.2' into tizen

Conflicts:
packaging/wrt-commons.spec
packaging/wrt-commons.spec