merge of '0c29b5c42b77169131d341373bedf1d5faf4af83'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Mar 2007 19:06:39 +0000 (19:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Mar 2007 19:06:39 +0000 (19:06 +0000)
commitd78994e8136e65d1cda9a9a5016e0e92a9b63bd4
tree27ee620235bdd1ffb28266ee0c287f833cab2264
parente0beacec71e8075fcadf4a3b58e0e81f21d6137f
parent51053d021c7d57e379e088fc0592895df748e0b1
Merge ... '0c29b5c42b77169131d341373bedf1d5faf4af83'
     and 'b6e208df4ac3f681a9a18f6b4cdaac3850de571c'