Merge branch '4.7' of ../oslo-staging-1 into 4.7
authorLorn Potter <lorn.potter@nokia.com>
Wed, 14 Jul 2010 04:06:57 +0000 (14:06 +1000)
committerLorn Potter <lorn.potter@nokia.com>
Wed, 14 Jul 2010 04:06:57 +0000 (14:06 +1000)
commit423e373ed0935ebe3d2f54a4c56101081c3311b5
tree35e27c69dee1d96775f4a921e93f5cd2e574a834
parenta9b6c59857c28f48e093abccaf9a89755b0995bc
parent444fa479484f80cbd5de3e9c5fa2b2e4082643dd
Merge branch '4.7' of ../oslo-staging-1 into 4.7