merge of '3dca1a73b62f0ff1be73ca1a304fd542319e323d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 31 Mar 2007 14:56:15 +0000 (14:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 31 Mar 2007 14:56:15 +0000 (14:56 +0000)
commitc736d28d5087860369a744e2ed10b8e92610fe97
tree1a72526670c29096bafb17f52ea8f0b6033d0464
parent304a829de08ce20c274f5a8e8038bd513f934dda
parentacc990526106b6ed000907c6dc0d3605679c71c5
Merge ... '3dca1a73b62f0ff1be73ca1a304fd542319e323d'
     and '90c926734111bd8bb89a763b03491eb3b15b1e96'