Merge branch 'master' into tizen_2.0
authorscrvisitor <scrvisitor@MCD2.(none)>
Wed, 23 Jan 2013 11:32:05 +0000 (15:32 +0400)
committerscrvisitor <scrvisitor@MCD2.(none)>
Wed, 23 Jan 2013 11:32:05 +0000 (15:32 +0400)
commit265e08d86e39a8c4674a8b554f36dc278d22c9ae
tree03b2692cc4bef5b33fdd8c23011814d7dbea355d
parentf4c39f9215bce1c931585e8cc4173166ac3d27af
parent57e010540b12628c3b075562a9ddcf48a8119580
Merge branch 'master' into tizen_2.0

Conflicts:
NOTICE
NOTICE.Flora
NOTICE.Flora