merge of '7393275c6ccce67cadeb49d4afb3459e56edf8a9'
authorHolger Freyther <zecke@selfish.org>
Sat, 22 Mar 2008 23:07:24 +0000 (23:07 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 22 Mar 2008 23:07:24 +0000 (23:07 +0000)
commitb7583ad497f08ad12abdd9bb3b00ceca5e26a17c
tree55488ffab354d01e376a76ede96af27fc112fe3f
parent0362af65b95845f571763fa56e6031a8089091fc
parent81f0f31a5d9bb1d2f9231b96485765db8b1860f8
Merge ... '7393275c6ccce67cadeb49d4afb3459e56edf8a9'
     and '7db6cb955e300c7001070d592c749d71ca29a88f'
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb