merge of '0a4d4659daacb61a9f99c17aa64908c24e07b67d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 9 Oct 2007 14:16:19 +0000 (14:16 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 9 Oct 2007 14:16:19 +0000 (14:16 +0000)
commitdc11f7ab4057b0c334dac98773efa66e090cc6f6
tree1bebfceb6ac3e93a09a865e62af8f7e65ed77cc4
parent7d24d4c5875d461d0c354e96e2c2933c77fae295
parent681e51f408724d742156b3bf6e083cc30f5b9160
Merge ... '0a4d4659daacb61a9f99c17aa64908c24e07b67d'
     and '16ef7e010f669266539951f43abdc37a983c762a'