merge of 'c6c70d85f855fe69c6ca29861984307ff57d8370'
authorKoen Kooi <koen@openembedded.org>
Sat, 7 Apr 2007 18:32:09 +0000 (18:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 7 Apr 2007 18:32:09 +0000 (18:32 +0000)
commit449aa15a1e9ee3343ecf6581ec53aca24c17ab21
tree03cef75776b7c1f6235aa7a6eea15ae8387ae8b7
parent7be956759ed4f9df1b3d0f038b0ec599da51aa55
parent977d898f72299c3c86b565cc002810a1e9cd8b7f
Merge ... 'c6c70d85f855fe69c6ca29861984307ff57d8370'
     and 'e02d37909aadff0a737759ca07c087999c357973'