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)
commit5572a1800cad7a28ce46edf87a64117e7b39ef1b
tree16a3955b0a6417b0fcbe69f8e0b05b7b2839aa49
parent96bf621c197b71221abb3c7d4974f1587a799f45
parentdaab0ec821a6a9b736be63670b6ca45aa25273e2
Merge branch 'buildsystem'

Change-Id: I1c898c399cab02bcaeeb2bdf6c86e06aa96c5fe9