merge of 'a4a93e205d5a389011745cf24cb1a68fbc0ed7e7'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 6 Jun 2007 14:13:56 +0000 (14:13 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 6 Jun 2007 14:13:56 +0000 (14:13 +0000)
commit2c8167306487b402abee1feffa8bf543fc44b33d
treeaa6eb893ff5b0f30c91a53c8c127e844d573b713
parentc2c7d6b185a6b88381eeb4820f8bae76dfd9ac2b
parentdf08ea5a36b5ea679f95da93042a2d3c0cf21bd9
Merge ... 'a4a93e205d5a389011745cf24cb1a68fbc0ed7e7'
     and 'b271566db667a7d227532eeb896b9f11d7e009c9'
packages/qt/qt4-x11-free_4.3.0.bb