merge of 94dc534986dc5c018c2c127e01fa7cac5f51270a
authorRod Whitby <rod@whitby.id.au>
Fri, 13 Jan 2006 23:00:25 +0000 (23:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 23:00:25 +0000 (23:00 +0000)
commit3f33387bc82e8eb58d073b9fa39c27c2db3bcf8b
treec10ed4fb8c93823961b368df6f5d7700d26133e5
parent1dc43aae3865d972ad7873ab841a77a0d96472b1
parent308ca12370f485243e31dea49bf3d98dde33c901
merge of 94dc534986dc5c018c2c127e01fa7cac5f51270a
     and d64372f18fedb4c3445dc88accadfe7e01613642