merge of 0733bfcfa824e0324d60f8ff76e749a1e93b5edd
authorMichael Lauer <mickey@vanille-media.de>
Mon, 12 Jun 2006 23:20:43 +0000 (23:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Jun 2006 23:20:43 +0000 (23:20 +0000)
commit03829814a583050e32ab8bcac2c0c5b5c04fc288
treef449630735329443177a21da33c77f1a25652337
parent95e3ee4e47c6fabd753f13fdf29d53af2b21d9ad
parent9c48b88d72d5191dcc158f7a15583851bbf0aeca
merge of 0733bfcfa824e0324d60f8ff76e749a1e93b5edd
     and 270776af34e87c9cc517853ec60bf8d4f809496e