Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Mon, 10 Jan 2011 14:11:52 +0000 (15:11 +0100)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Mon, 10 Jan 2011 14:11:52 +0000 (15:11 +0100)
commit44afade51254de33a0f31baf39034af0eb73842f
treecd9c75a8d37be58a5022a545aa939eff9e196730
parent3263f8036128cc4403cf6383324f5390eecee13b
parent2bddf15b87a9e27bfdcbc3aec5d79da49f070c15
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2