explicit_merge of '67a7cd199ed48c512b8405c701f22fe1fd94bd17'
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 3 Jan 2006 21:55:52 +0000 (21:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jan 2006 21:55:52 +0000 (21:55 +0000)
commit14e90875fff476f1c8487d781e44c8d9f83179d5
tree09ed26939a5ab145fdc1750602825413ec20d725
parentd34dcad36f230f617dd4f6a784adef4fd54c827c
parent8a044e2b7f294444e444d70d55d1a4868640a069
explicit_merge of '67a7cd199ed48c512b8405c701f22fe1fd94bd17'
              and 'd4bebe8bd4a495c716a9547b0a5aabad739ab5b8'
   using ancestor ''
        to branch 'org.openembedded.dev'