merge of a43a3081d043237ce284af591c69b35171e746be
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 14 Aug 2005 18:00:44 +0000 (18:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 18:00:44 +0000 (18:00 +0000)
commit116dddad4ec038b7d4322f8201556e6cf420fb96
tree6b63fde6284678a936958ac42f0743a8e1869e70
parentaa37baae309e595282a53af6cdfe7a5a77eb530a
parent856f8e9dbe8ab445ecde0e10c86bcc9b0bda00f8
merge of a43a3081d043237ce284af591c69b35171e746be
     and b91f743ce475bca1b138c7fd63260e83a34f53c2