merge of b6447bbbb5bade625f6d420c64aea5058cdd13f3
authorPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 7 Feb 2006 22:34:17 +0000 (22:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 7 Feb 2006 22:34:17 +0000 (22:34 +0000)
commit7000a872cc1e36466b42e42b7e5ddf2bb1a96a39
treea967e68783a4a63df2ce3cac4a2b3d0d8b16e6cc
parent234de9320961177b4f228d54035043c815ed2d36
parent10da525f08277902dfccc92a7310e7d337a9d626
merge of b6447bbbb5bade625f6d420c64aea5058cdd13f3
     and bc23517ec32ecd81c447b68448a9d895dc712e4c