merge of '15ad25c2df41e72ad281610da11230b4d0c9bd20'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 6 Jan 2008 01:29:28 +0000 (01:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 6 Jan 2008 01:29:28 +0000 (01:29 +0000)
commitbbcffeebb0e4b33f0a20fa73699fdd21c98391ce
tree69d7da22bde7d43f6de438fbab3658d0a48a1861
parent3344d43f7614643796b97340e567e6eb712c3026
parent169379dfeb17cd0e926e6a5760a012cc295ef4db
Merge ... '15ad25c2df41e72ad281610da11230b4d0c9bd20'
     and '5bfb1624d0726e9c07b5b20f7ecccb236fee357c'