Merge upstream version 1.26
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Mon, 13 May 2013 07:22:45 +0000 (10:22 +0300)
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Mon, 13 May 2013 08:16:52 +0000 (11:16 +0300)
Makes it possible to build Debian packages too, from the same branch.

Change-Id: Ie51d5413aeddc722e719bf926eb4bd1f0bcf4921


Trivial merge