Merge commit 'v4.7.0' into 4.7
authorJason McDonald <jason.mcdonald@nokia.com>
Tue, 21 Sep 2010 10:44:18 +0000 (20:44 +1000)
committerJason McDonald <jason.mcdonald@nokia.com>
Tue, 21 Sep 2010 10:44:18 +0000 (20:44 +1000)
commit60b859b25b5da9e7f07888c2b7b26da27ed59117
treee3dc228a708a90116d0420933dafac05e7ac4445
parent660ec910ef60513b511e2292255e53701dbb239b
parent657a1c6a96d78f18b92b72aba3e8d1621114d39b
Merge commit 'v4.7.0' into 4.7