merge of '3889e1126647417898dfc189538f194f3cf760fb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 24 May 2008 13:20:46 +0000 (13:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 24 May 2008 13:20:46 +0000 (13:20 +0000)
commitffba08e7d51eb62ba4ce0622c672954fff784e82
tree3532c513393b90611c722c158a2be0d32d843ea3
parent14f4cbd900b0d2183be363b5bfcf89eff763a800
parente43c9a81a4400540763d88caa5c377f06f78916e
Merge ... '3889e1126647417898dfc189538f194f3cf760fb'
     and '6ba3477131d507125b7da775792be1ddb5bdf90c'