merge of 3af6af596405ee2d8df8c79397157adaf28023b3
authorJustin Patrin <papercrane@gmail.com>
Fri, 10 Feb 2006 04:48:23 +0000 (04:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 10 Feb 2006 04:48:23 +0000 (04:48 +0000)
commit5475414a7806c4f9e82beb940caedfd60a1db74b
tree68df70f926fccd8992df5cfebcb502a3c2f0c28c
parent1dfe53cd17ef4fb243b8fbdbd74ccfe76e40c09f
parent52675a0f186a37449790b58e8b4bfd0f7e655251
merge of 3af6af596405ee2d8df8c79397157adaf28023b3
     and 96b18d585efe43c8bffa43523fa2b70496cc94fb