merge of '429208b5266a7b0f415415f366574681726ab49f'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 21 Feb 2007 10:54:08 +0000 (10:54 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 21 Feb 2007 10:54:08 +0000 (10:54 +0000)
commita7993804a3fadfda834e2fc23314648d0211eb8a
tree0abf2fdea104499f7b589519776dd4359ba0d390
parent3960c851b59a019213c37e83631b64e8d4f2030b
parent3078c6538cc2b8b2e3d939b62844a40306c89ef7
Merge ... '429208b5266a7b0f415415f366574681726ab49f'
     and 'beda0ffc34e6b35f9e80abe1e9589e827a8d52a7'
packages/gpephone/task-gpephone.bb