Merge branch 'buildsystem'
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 19 Jun 2012 16:42:13 +0000 (18:42 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 19 Jun 2012 16:42:55 +0000 (18:42 +0200)
Change-Id: I1c898c399cab02bcaeeb2bdf6c86e06aa96c5fe9


Trivial merge