Merge branch 'buildsystem'
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 27 Jun 2012 20:47:08 +0000 (22:47 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 27 Jun 2012 20:47:19 +0000 (22:47 +0200)
Change-Id: Ibe002ec394142f4e2d36a6d7e1fc0e1239a68672


Trivial merge