merge of 'a1cb25296413fab486698a312f9422fd8e6b9342'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 15:35:09 +0000 (15:35 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 15:35:09 +0000 (15:35 +0000)
commit171a5d36f7db136c2b56fac6d7e9396c9708fd00
tree845d94d618c842bd065a4e2705c1b54d74e25b74
parentbd97babc56429231463e789ff1449b5443451ad7
parent05a838f9c50b866fb58e5ddb4a7fa94bb594aefd
Merge ... 'a1cb25296413fab486698a312f9422fd8e6b9342'
     and 'c252dde625fb682071e942d170c75c354060974b'