merge of 4f3b068b42e8ca31b85ba27c4b0497b10dd7f320
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 5 Aug 2005 19:40:04 +0000 (19:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Aug 2005 19:40:04 +0000 (19:40 +0000)
commit7456f5321d5953fa8fc2ae36cd61f2a363e60f69
tree055544e72db72e658834dd41555d4933c58bad05
parent016b2daaba8bee36e5fd54f6fb7b0604db88daf1
parentf7b7fcf8cf21ee1dc4200ad949d68b7c9cde7aa7
merge of 4f3b068b42e8ca31b85ba27c4b0497b10dd7f320
     and db631e19abd4d2b1049a24b5d7ea623dc8673a99