merge of 3fb414835838a0d53a0dc370c4a0c87cfec614eb
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 5 Feb 2006 06:51:27 +0000 (06:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 06:51:27 +0000 (06:51 +0000)
commitbdead074e60a1221f8fe372046bcddb0a7ab938d
treeae5cef60ad7ed6c18fde35f386af47be02520775
parent8334dd645cd67983293e9fc88a55ef5fcab245da
parentdc20efdac5955750b579ad16e2515f63ab8d0f8e
merge of 3fb414835838a0d53a0dc370c4a0c87cfec614eb
     and 8703efdf079cb272c994f94de7414694d20cc052