merge of 'e7b51cdff552f8acee23869051f6d9ddf9b5cb85'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Jan 2007 16:40:10 +0000 (16:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Jan 2007 16:40:10 +0000 (16:40 +0000)
commitd9b60feae19bd118ed949fe37a4cbc43a7db33cd
tree071f8bb362110e7cc49584b76e38879d10d4277a
parentab3bd3d9a4f19d2c1277e5e7febe030b3a7eb9c5
parent0e27cef05efe1894c14fe047fd613fa11b558e43
Merge ... 'e7b51cdff552f8acee23869051f6d9ddf9b5cb85'
     and 'ff4945554f42e9be0ee0cf9d1a222718ac61d4b6'