Merge branch 'master' into tizen
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 10 Jun 2014 14:52:59 +0000 (15:52 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 10 Jun 2014 14:52:59 +0000 (15:52 +0100)
commit0132b05251c067b8750f151496e49f824941da7f
treebd28d2911187c26f0c77888a8f96bcf4aab10318
parent8f2c5571c924479b6a07a2c2187dedd9c685baf0
parent846ed24dfdadc75759e95d188db6bbbf3bff93ae
Merge branch 'master' into tizen