Merge branch 'master' into webkit
authorBartosz Szatkowski <bulislaw@linux.com>
Tue, 31 Aug 2010 12:49:34 +0000 (14:49 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Tue, 31 Aug 2010 12:49:34 +0000 (14:49 +0200)
commitbaccb38b612a339ee29ae43832bcf08f5bb6d942
treeb7996c8e498d01722f4275315cb743edfaa13c6f
parent2a5fc574a1c2754d832fc251347000f51f251d45
parent11e55d0146706b0a759a852d47cbc792b6474c48
Merge branch 'master' into webkit

Conflicts:
trunk/src/base/base.pro
trunk/src/base/base.pro