Merge branch '4.8'
authorDavid Boddie <david.boddie@nokia.com>
Tue, 24 May 2011 19:18:52 +0000 (21:18 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Tue, 24 May 2011 19:18:52 +0000 (21:18 +0200)
commit0f8eddaf60e3854aeda4c5d16cd740cc510ca941
tree9a33aa05d2f42e8fd9d48d6385a47172e5fd3b83
parente463546d11464699061574d671d5cd5f3c14f05f
parentf37c49985f2382b86fe91f7b7224c8fd92961ac9
Merge branch '4.8'