Merge branch 'master' into task/slp/release
authorSung-jae Park <nicesj.park@samsung.com>
Wed, 2 Jan 2013 06:18:17 +0000 (15:18 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Wed, 2 Jan 2013 06:18:17 +0000 (15:18 +0900)
commita09db9367b7f388a22ede6ce555a2e5d83940dab
treed2be02c66aa55fc74c374dbd23642e9bc4f7867b
parentb974eb33f89973a2077a9793bbc3034933eb0799
parent63fb6fc9ad6d94dfa58fbc21d293d82f248221f4
Merge branch 'master' into task/slp/release