merge of 2e715e0002b1abd606680bde1f426f3384e1863a
authorMichael Lauer <mickey@vanille-media.de>
Sun, 26 Mar 2006 22:28:25 +0000 (22:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 26 Mar 2006 22:28:25 +0000 (22:28 +0000)
commit49de111e7100b173dedad323fa7537bd4b362c37
tree1c04540d8868287965fecd7bb4616b8ec2a95d0d
parentdf2a64dbc7fe5e334cac55a628a2785280eb90de
parentf6f3d654a28cd012fbf275f7b74e8d6c94846c96
merge of 2e715e0002b1abd606680bde1f426f3384e1863a
     and b2304690cc6d600f6d72f824769d026ba7fbe63c