merge of '38a9dd2ba2b2469b6368cf23490a2f8d5fec3065'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:02:41 +0000 (19:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:02:41 +0000 (19:02 +0000)
commita02935a50101aba5621d8ca06d83da5aa1261b46
treec2cbc71b06c2d650606ca947b9eb8e713250b882
parente7a395a40026bc2409cac42cf669a8f6f0c51e51
parent8d27657bf723542f7ed862698bd60a094b8f9c02
Merge ... '38a9dd2ba2b2469b6368cf23490a2f8d5fec3065'
     and 'd06ab8ea3c49e1734c6984d23d283558d4aef52c'