merge of 1d5096723ae55a2facbdf4127204dbc5db3b220f
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 19 Mar 2006 17:00:27 +0000 (17:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Mar 2006 17:00:27 +0000 (17:00 +0000)
commit37f4f9e46425350a18b9d9cf2ad51731e3960d1b
treecb5dd427c3b5adfb3f08572ca5960d38f7958a3d
parent0ff1aa28d7db528a15e9644fc52ba41ca0c4825f
parent10c1d3f5b7af531af5844b6839e8d95d2beab2a8
merge of 1d5096723ae55a2facbdf4127204dbc5db3b220f
     and cb0dad155770a3169e567722b7aa898d536f7e35