Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen accepted/tizen/20131022.010752 accepted/tizen/20131022.162619 submit/tizen/20131021.214451
authorSoo-Hyun Choi <s.choi@hackerslab.eu>
Sun, 20 Oct 2013 08:18:57 +0000 (17:18 +0900)
committerSoo-Hyun Choi <s.choi@hackerslab.eu>
Sun, 20 Oct 2013 08:19:26 +0000 (17:19 +0900)
commit3b30aa3c5bfc0360fab144d0317c5a8528afbe43
tree86c31d759ff40e3e1722f30f55d9c3cfac524a1b
parentdbec08fe45b6a104ed45c3dcf1294ff96aa92973
parent7309af129f15b6f76b24585a5cc0794e1353ac4c
Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen

Conflicts:
etc/wrt_commons_create_clean_db.sh

Change-Id: I101e70f5be96342d3de62f1632c7bb9ab9aae0a4
etc/wrt_commons_create_clean_db.sh
packaging/wrt-commons.spec