merge of 0856e0c924897487f6fe46a20c85d346215d0090
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 14 Aug 2005 23:03:05 +0000 (23:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 23:03:05 +0000 (23:03 +0000)
commit0b08711364c1884e13149ec231a1e174d2197a31
treeae96c78ede1d3980371bbee5a24473d55044345c
parentcd69a59c608a7091377ba4efdca955cbd5b987f0
parentb160c6be87e51e4f3c0652d0255bebdb39bd099f
merge of 0856e0c924897487f6fe46a20c85d346215d0090
     and ef312c48edbba5ce136474d6aef3ac78400707b7