Merge branch '4.5' into 4.6
authorRohan McGovern <rohan.mcgovern@nokia.com>
Wed, 9 Sep 2009 03:48:24 +0000 (13:48 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Wed, 9 Sep 2009 03:48:24 +0000 (13:48 +1000)
commit9fc309a822490ba93c4c7a1fa1221b288e145a3d
tree98652a86fe2125ccb7a7c194b1e1da205f9eb79d
parentdec9ab81e8a62a67d9ce1b0163879d61639aeefa
parentb3d8d30b254b23f15089dc0caf9a41a24bad817e
Merge branch '4.5' into 4.6

Conflicts:
tests/auto/moc/os9-newlines.h