merge of '14adef1cb8437a9298373d856f25c230125dcdf6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Feb 2008 11:27:25 +0000 (11:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Feb 2008 11:27:25 +0000 (11:27 +0000)
commit27254ef091ddf921448eade021b620ebd9a8fc50
tree71ce93a17385e4f624d6e5a94f4c1b9ce76273ac
parent9e1879c6bff04588c342854632b4569ea1273a97
parent387f7d8d065b710036dcddf2be1b6d1809133acd
Merge ... '14adef1cb8437a9298373d856f25c230125dcdf6'
     and 'b1eda41fd5a73d8e2f521e7ad1668a7736e90afd'