merge of '58a64bc4f0e9295e4e68eaf15495ee2eb9e6fbd8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 Jan 2008 15:30:47 +0000 (15:30 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 Jan 2008 15:30:47 +0000 (15:30 +0000)
commitafb0f20bdd09cacf09e4757bb6a40cc14b8a7e91
tree2acfdf2e614d6813fcf6d8920f7e05988a9cd657
parent438c37c80601fdbff139eef84d492fbf84d39675
parent6644a5476fc6289b19163b46e5b3b49c61f3bb78
Merge ... '58a64bc4f0e9295e4e68eaf15495ee2eb9e6fbd8'
     and '72f985b233bd7f6a6cccf8ae78b46faac96fd50a'