merge of '62840d70a6509ba3585a883b01fcbdd249f064ed'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 11:30:58 +0000 (11:30 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 11:30:58 +0000 (11:30 +0000)
commitdbe286e8e4a8c039641b0f94bd7573e37b85992d
tree21149240ef9b97b9ad16d5a25be2ac6af8a6aa98
parent2337e3499a5c966f57e0973eef98fe46b47a5214
parent9bde50d3d31d8a56a4aa81f020709b4cb1951c43
Merge ... '62840d70a6509ba3585a883b01fcbdd249f064ed'
     and '83f11f55f23096e3345625ae476f2ba29676420b'