merge of '540ebc99010568ee45c73efb2febc13a9df00288'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 28 Apr 2007 23:19:12 +0000 (23:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 28 Apr 2007 23:19:12 +0000 (23:19 +0000)
commit4ae90f26af34d0fd57e0931b155207a68550a54d
treea875819aee5b0197cc6348caf953b99549581027
parent991eaad8bc38953e945f1b431e787b43d1337164
parentaefcddd1b9edab4b50eb1eac321c16e831182c13
Merge ... '540ebc99010568ee45c73efb2febc13a9df00288'
     and 'aaea0467de32876d1094521c446e1e04f7d79c7f'