merge of '28e2872ee9420efa1c6785b37d88314496a12175'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Dec 2007 17:27:45 +0000 (17:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Dec 2007 17:27:45 +0000 (17:27 +0000)
commit9818cb466e37b29cb87a54fe2daa70f7ec92b90a
tree9ec185a31535880512ae234a393f32c677c1ca3b
parentce596efe3e110dd1e180086c29c733eb155c0173
parentc6aa92680ee15b79713585687579dd1687e2bd39
Merge ... '28e2872ee9420efa1c6785b37d88314496a12175'
     and '2c1b6fa0891e86d61e015c51b2b0fc0690789b70'