merge of '4fe495c9a4ef398e11ec8bc90de91ce7a9a94c3d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Oct 2007 17:12:08 +0000 (17:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Oct 2007 17:12:08 +0000 (17:12 +0000)
commit8fde3dd1477ce3daadc2b4376ea82be86ebb62ad
tree006ddcc473ec32701e9bba6846384dc46d987cd2
parent351620a4b2fa560608d1eb1c6692502b1d456c43
parent7c81d6bd796d9ee6ba3698bba88e952bc10a6066
Merge ... '4fe495c9a4ef398e11ec8bc90de91ce7a9a94c3d'
     and 'ba74774ae8f7988d8fb8f6cfed387fe5b46af7c0'