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)
commit3c65692112268a3700d2080d7e1f8c934e7e000a
tree417f3558352ab0cf26d64c9a21c74c3174d8f965
parent314cccc7dde56c2989a500da9ebcd0d56c08a46a
parentb15cbc0b88466f3d40d7869a90899bd2a114c7b8
Merge upstream version 1.26

Makes it possible to build Debian packages too, from the same branch.

Change-Id: Ie51d5413aeddc722e719bf926eb4bd1f0bcf4921