merge of 'ace7ee05b32c937d9f796b47ec02fd555802e032'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 4 Nov 2007 14:22:50 +0000 (14:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 4 Nov 2007 14:22:50 +0000 (14:22 +0000)
commit34544fcd2139afd20bbbe9d0b6fbc7ff6afb0520
tree22ddf3a8e04507874ec10fe72d27d7072b4ffc25
parent65c14f959dc2bbc5174b1e545cdd4e02518bddee
parentef15cabe66f57e3b410cd50f6fd4cc1ecd4631e8
Merge ... 'ace7ee05b32c937d9f796b47ec02fd555802e032'
     and 'bea514a9446c6b1f4c44cd730bcb2c6daa5e0f7b'