Merge branch 'tizen' of ssh://tzo/profile/ivi/Modello_Common into tizen 12/27912/1 accepted/tizen/ivi/20140926.101640 submit/submit/tizen_ivi/20140922.203947/20140922.204045 submit/tizen_ivi/20140925.000606
authorBrian Jones <brian.j.jones@intel.com>
Mon, 22 Sep 2014 20:20:12 +0000 (13:20 -0700)
committerBrian Jones <brian.j.jones@intel.com>
Mon, 22 Sep 2014 20:20:12 +0000 (13:20 -0700)
commit35bc6cb1427ac4fe854f78e216000f979cb446ea
tree5d4be05278118ab44d4b3c2c7e5e8bf273b41ee0
parentd2a9aa647884336363a3b11b53151675fe87fb9a
parent9b991dcdd1101d3fe1a9b1be39ca983eb3562cb7
Merge branch 'tizen' of ssh://tzo/profile/ivi/Modello_Common into tizen

Conflicts:
packaging/modello-common.changes

Change-Id: I978cc2194ee71f58363382f88e34b4b1ebefac19
packaging/modello-common.changes