merge of e588b97112ee40d0ed224469b12043a82ffb1366
authorJustin Patrin <papercrane@gmail.com>
Mon, 16 Jan 2006 20:12:53 +0000 (20:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 20:12:53 +0000 (20:12 +0000)
commitf28138ea966f7852229736197c34b416f2ba450c
tree8d579dae27a5a5d934bb07764cec7b3fb64eb3cf
parent6e217552944efc56513ff6bb1cc6d3218a84ca14
parent47cde1bfb6658f5464862c4cf362fac5f5e90cda
merge of e588b97112ee40d0ed224469b12043a82ffb1366
     and e9149816636e3db5bcc9dc0ca532822828606a50