merge of c495c19159f4a954f2b8e7b6ecd3c1e60fbf15df
authorJohn Bowler <jbowler@nslu2-linux.org>
Sat, 21 Jan 2006 05:54:52 +0000 (05:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jan 2006 05:54:52 +0000 (05:54 +0000)
commit325e11a718cf09f9df860effc16b6c22de6e01a2
tree0364c4d9f336d5ae222639a8cbd45d5526cb6f4f
parent389b49905aa8ed95caf720f0fc7d734e511ace84
parentb068dbd2142c8aa200dbfb2a1b573e60a3fd1244
merge of c495c19159f4a954f2b8e7b6ecd3c1e60fbf15df
     and def6c51e33aca81d009da117feae54ed9217310e