Merge branch '2.0_beta'
authorJussi Saavalainen <jussi.saavalainen@ixonos.com>
Wed, 17 Oct 2012 09:40:41 +0000 (12:40 +0300)
committerJussi Saavalainen <jussi.saavalainen@ixonos.com>
Wed, 17 Oct 2012 09:40:41 +0000 (12:40 +0300)
commited85070e17494c1213f01fb7af00f2dab6eef305
tree587f8d0fafe957789d75970093bb591ab6922b3e
parentc39688384650eee3480af7b460368ab9ee72c575
parent9f9ab01553ffaa7962667c891cecc0ba8f23ceea
Merge branch '2.0_beta'

Fix conflicts caused by gbs changelog

Conflicts:
packaging/mfldv4l2camsrc.changes

Change-Id: I1327eb986e35ef3bb1a3e06e6a1c5fb4d21db3a4