Merge branch 'master' into sdk-0.0.1
authorXavi Artigas <xartigas@fluendo.com>
Mon, 1 Oct 2012 15:52:10 +0000 (17:52 +0200)
committerXavi Artigas <xartigas@fluendo.com>
Mon, 1 Oct 2012 15:52:10 +0000 (17:52 +0200)

Trivial merge