merge of '1bc752476d60763f743d387738c05fb0a18060d8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Mar 2008 23:31:49 +0000 (23:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Mar 2008 23:31:49 +0000 (23:31 +0000)
commitbfb284d56e867ecd86ef504685fce1f3126e6b92
tree43e6d84a75bb8397ece438e6754c42dc7740bec1
parent7265791dadcd90742e6a37a2cbb22cdc98e70971
parent539ca100c445a5947dbda721f72d5dc43a8dccfe
Merge ... '1bc752476d60763f743d387738c05fb0a18060d8'
     and '682b7f9bc2342713ca6c743f6c5d9edcb8f771b9'