merge of 'b4db7faff89bf68649ff9993f351d168e6ee5446'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 Jan 2008 15:30:57 +0000 (15:30 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 Jan 2008 15:30:57 +0000 (15:30 +0000)
commit899e0e319cef44fa5d81d636722b3a3e24aa7cb3
tree1778620aa6be77b0e2de31cf9a8e53bb8f41e39a
parent7b9de9ebe8559476d3545b733284376892a2bda9
parentafb0f20bdd09cacf09e4757bb6a40cc14b8a7e91
Merge ... 'b4db7faff89bf68649ff9993f351d168e6ee5446'
     and 'f8ff231a78b465cc9a7581f07cda1458d94ad382'