merge of 7484256711bab20f56c5b8cfe94ae9c4a0fac36a
authorMichael Lauer <mickey@vanille-media.de>
Wed, 12 Jul 2006 21:36:47 +0000 (21:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 21:36:47 +0000 (21:36 +0000)
commit738a9bde53edf9462237240a72fd8bfd867f8b2e
tree49bdce579f0aee9dae9b7fa71a8dc2f3e6b88a63
parent4c83778e31aaaa2c9c70872795aaef94e3fa5872
parent93fff36d161db9939c51f287f5ef8b89936842a3
merge of 7484256711bab20f56c5b8cfe94ae9c4a0fac36a
     and b2faac906eea0c47c1b5d14cff00776242589b25