merge of 050c7f49109b8bf3ea8516bec1745c93a28a1b83
authorKoen Kooi <koen@openembedded.org>
Thu, 29 Dec 2005 09:25:21 +0000 (09:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Dec 2005 09:25:21 +0000 (09:25 +0000)
commitd27b92aaa3e609bd91464204be08877e42bb9ab6
tree03ded166588ab8999a135df1592450be3be48250
parent4008b2ebc133f1a3f7a2ee88e72eb3e4d8c794e9
parent9127d4721c6648fb6119ab3d280d62554ae51ec2
merge of 050c7f49109b8bf3ea8516bec1745c93a28a1b83
     and d5cad88ce1e757a9ebbac7f47c3c0e728e5a3482