merge of 0b09834f6c4f44d4145ed8d06e17ecf1d1c48029
authorMichael Lauer <mickey@vanille-media.de>
Mon, 17 Apr 2006 13:44:06 +0000 (13:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Apr 2006 13:44:06 +0000 (13:44 +0000)
commit548f2cd5ba570b5bb22d02c2ff0cf51abbd850e5
tree64c972c6e08fca4dfea2615a830e34692f9f371b
parent023e076d6f391b096e66f9d5bdfcfc8bbe3cb84a
parentedc2f08be8d50b539bddb9386424bc2dd2e647bd
merge of 0b09834f6c4f44d4145ed8d06e17ecf1d1c48029
     and e96a56e5b78296091533ce1d0a3856405435e1ec