merge of '7f7ecaeecb75904bd446276f156340f12b4213c7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 May 2008 22:13:14 +0000 (22:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 May 2008 22:13:14 +0000 (22:13 +0000)
commit1cc77842b921d55096211543c91b91ecca25ad81
tree4dac25762f35b6392125f2e0bacf260a8d446c48
parent8bb942cfe86d9a37a3dbff31eb0163a3cab1c192
parent378c7b7c13dfbd91cbf41ba63d78de9c9e604b13
Merge ... '7f7ecaeecb75904bd446276f156340f12b4213c7'
     and 'f4fc6d5b07cfbbf0922b31fa7a5f3163c120543d'