merge of 29e6764d0920c0357aa34e6e348e962da7fd316f
authorMatthias Hentges <oe@hentges.net>
Sat, 13 May 2006 22:16:31 +0000 (22:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 May 2006 22:16:31 +0000 (22:16 +0000)
commitcab3617a57c2308ef14d43acfe4d3db8fbaf6c74
tree30e1f3a28aad803c195ba802ed6134272144caf1
parentd525077ac27d0fd93215fd4e9dd3e132398c025b
parent4e612daf20e1bef5c1ddea5d4a730a0f6b57e2bf
merge of 29e6764d0920c0357aa34e6e348e962da7fd316f
     and f10f5c840e362f84286526ff42c23d83c7c73e62