merge of 67f2ba05e3794b7091b464ce3cd91e59e129a5a2
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 9 Sep 2005 05:47:17 +0000 (05:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Sep 2005 05:47:17 +0000 (05:47 +0000)
commit32691a11754485c3b90a5c38580aadc4db42fbe2
tree7c0e79d7478c346ce5b1c36ded5b52883510fc37
parentaeb77bd6d1545ce1207553a4e5a01eef6a1d43bd
parent7002873dffc9a8f2758e96f1cdeadaccdae6f96c
merge of 67f2ba05e3794b7091b464ce3cd91e59e129a5a2
     and e55a199a204af711c51f5c00ac2612d54f98edc2