Merge branch '4.7' into 13092010doc
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>
Thu, 16 Sep 2010 08:33:12 +0000 (10:33 +0200)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>
Thu, 16 Sep 2010 08:33:12 +0000 (10:33 +0200)
commit7248ba672f47501bf94dfc3e18ec03c4c6d27750
treedc4f1d50af98bbd21ba14482dd8adf3edff77787
parent7eb53c4b8d9745f998694f3dbe88dab6791d0e81
parentf9a6a8bc03cefe8ea90f695efd9d1e7c8d96321a
Merge branch '4.7' into 13092010doc