merge of '195349e45808ef372f79fd4ac6edd04f4c558162'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 6 Mar 2007 13:30:55 +0000 (13:30 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 6 Mar 2007 13:30:55 +0000 (13:30 +0000)
     and '6bd2a3b3d0231ed23e5bbc1278d99b7d7d6771f4'

1  2 
packages/tasks/task-gpephone.bb

Simple merge