htcuniversal: A bit of merge funkyness due to vimdiff braindeadness.
htcuniversal: A bit of merge funkyness due to vimdiff braindeadness.

sledz/oe,philb/pbcl-oe-2010,thebohemian/openembedded,nvl1109/openembeded,crystalfontz/openembedded,nvl1109/openembeded,demsey/openembedded,Martix/Eonos,sledz/oe,YtvwlD/od-oe,popazerty/openembedded-cuberevo,dave-billin/overo-ui-moos-auv,thebohemian/openembedded,JrCs/opendreambox,JrCs/opendreambox,nx111/openembeded_openpli2.1_nx111,YtvwlD/od-oe,JamesAng/goe,JamesAng/goe,YtvwlD/od-oe,yyli/overo-oe,dave-billin/overo-ui-moos-auv,mrchapp/arago-oe-dev,SIFTeam/openembedded,nx111/openembeded_openpli2.1_nx111,John-NY/overo-oe,Martix/Eonos,crystalfontz/openembedded,dellysunnymtech/sakoman-oe,YtvwlD/od-oe,scottellis/overo-oe,KDAB/OpenEmbedded-Archos,crystalfontz/openembedded,buglabs/oe-buglabs,sampov2/audio-openembedded,xifengchuo/openembedded,anguslees/openembedded-android,sledz/oe,sledz/oe,nlebedenco/mini2440,thebohemian/openembedded,anguslees/openembedded-android,mrchapp/arago-oe-dev,rascalmicro/openembedded-rascal,openpli-arm/openembedded,Martix/Eonos,sutajiokousagi/openembedded,KDAB/OpenEmbedded-Archos,JamesAng/oe,philb/pbcl-oe-2010,anguslees/openembedded-android,philb/pbcl-oe-2010,Martix/Eonos,sampov2/audio-openembedded,scottellis/overo-oe,yyli/overo-oe,hulifox008/openembedded,libo/openembedded,KDAB/OpenEmbedded-Archos,dave-billin/overo-ui-moos-auv,nvl1109/openembeded,nzjrs/overo-openembedded,hulifox008/openembedded,trini/openembedded,popazerty/openembedded-cuberevo,troth/oe-ts7xxx,Martix/Eonos,thebohemian/openembedded,yyli/overo-oe,sutajiokousagi/openembedded,nlebedenco/mini2440,demsey/openembedded,openembedded/openembedded,JamesAng/goe,trini/openembedded,JamesAng/oe,BlackPole/bp-openembedded,openpli-arm/openembedded,nlebedenco/mini2440,YtvwlD/od-oe,crystalfontz/openembedded,Martix/Eonos,sutajiokousagi/openembedded,sutajiokousagi/openembedded,SIFTeam/openembedded,buglabs/oe-buglabs,sentient-energy/emsw-oe-mirror,rascalmicro/openembedded-rascal,thebohemian/openembedded,giobauermeister/openembedded,JrCs/opendreambox,trini/openembedded,openembedded/openembedded,sentient-energy/emsw-oe-mirror,nx111/openembeded_openpli2.1_nx111,libo/openembedded,BlackPole/bp-openembedded,anguslees/openembedded-android,thebohemian/openembedded,popazerty/openembedded-cuberevo,YtvwlD/od-oe,JrCs/opendreambox,sampov2/audio-openembedded,libo/openembedded,popazerty/openembedded-cuberevo,openembedded/openembedded,dellysunnymtech/sakoman-oe,giobauermeister/openembedded,sutajiokousagi/openembedded,JamesAng/goe,sentient-energy/emsw-oe-mirror,mrchapp/arago-oe-dev,nx111/openembeded_openpli2.1_nx111,KDAB/OpenEmbedded-Archos,scottellis/overo-oe,giobauermeister/openembedded,dellysunnymtech/sakoman-oe,SIFTeam/openembedded,openembedded/openembedded,demsey/openembedded,bticino/openembedded,dave-billin/overo-ui-moos-auv,openpli-arm/openembedded,xifengchuo/openembedded,demsey/openenigma2,nlebedenco/mini2440,buglabs/oe-buglabs,troth/oe-ts7xxx,sentient-energy/emsw-oe-mirror,BlackPole/bp-openembedded,buglabs/oe-buglabs,hulifox008/openembedded,openpli-arm/openembedded,sledz/oe,dave-billin/overo-ui-moos-auv,anguslees/openembedded-android,xifengchuo/openembedded,YtvwlD/od-oe,openembedded/openembedded,hulifox008/openembedded,JrCs/opendreambox,rascalmicro/openembedded-rascal,John-NY/overo-oe,rascalmicro/openembedded-rascal,buglabs/oe-buglabs,demsey/openenigma2,yyli/overo-oe,popazerty/openembedded-cuberevo,bticino/openembedded,troth/oe-ts7xxx,xifengchuo/openembedded,openembedded/openembedded,YtvwlD/od-oe,nzjrs/overo-openembedded,KDAB/OpenEmbedded-Archos,xifengchuo/openembedded,yyli/overo-oe,rascalmicro/openembedded-rascal,openembedded/openembedded,anguslees/openembedded-android,rascalmicro/openembedded-rascal,giobauermeister/openembedded,scottellis/overo-oe,SIFTeam/openembedded,nlebedenco/mini2440,demsey/openembedded,scottellis/overo-oe,demsey/openenigma2,dave-billin/overo-ui-moos-auv,demsey/openenigma2,libo/openembedded,openpli-arm/openembedded,crystalfontz/openembedded,dellysunnymtech/sakoman-oe,troth/oe-ts7xxx,bticino/openembedded,mrchapp/arago-oe-dev,John-NY/overo-oe,demsey/openenigma2,trini/openembedded,BlackPole/bp-openembedded,sentient-energy/emsw-oe-mirror,nlebedenco/mini2440,dellysunnymtech/sakoman-oe,JamesAng/oe,openembedded/openembedded,giobauermeister/openembedded,nlebedenco/mini2440,dellysunnymtech/sakoman-oe,dellysunnymtech/sakoman-oe,JrCs/opendreambox,libo/openembedded,JamesAng/oe,sledz/oe,KDAB/OpenEmbedded-Archos,mrchapp/arago-oe-dev,KDAB/OpenEmbedded-Archos,demsey/openenigma2,demsey/openembedded,xifengchuo/openembedded,nx111/openembeded_openpli2.1_nx111,nzjrs/overo-openembedded,dellysunnymtech/sakoman-oe,openembedded/openembedded,bticino/openembedded,troth/oe-ts7xxx,mrchapp/arago-oe-dev,trini/openembedded,demsey/openenigma2,xifengchuo/openembedded,JrCs/opendreambox,John-NY/overo-oe,thebohemian/openembedded,John-NY/overo-oe,demsey/openembedded,sampov2/audio-openembedded,SIFTeam/openembedded,dellysunnymtech/sakoman-oe,nzjrs/overo-openembedded,openembedded/openembedded,libo/openembedded,scottellis/overo-oe,John-NY/overo-oe,BlackPole/bp-openembedded,JrCs/opendreambox,nzjrs/overo-openembedded,buglabs/oe-buglabs,scottellis/overo-oe,hulifox008/openembedded,popazerty/openembedded-cuberevo,nzjrs/overo-openembedded,JamesAng/goe,nx111/openembeded_openpli2.1_nx111,sentient-energy/emsw-oe-mirror,BlackPole/bp-openembedded,BlackPole/bp-openembedded,buglabs/oe-buglabs,rascalmicro/openembedded-rascal,SIFTeam/openembedded,JrCs/opendreambox,popazerty/openembedded-cuberevo,anguslees/openembedded-android,bticino/openembedded,mrchapp/arago-oe-dev,philb/pbcl-oe-2010,trini/openembedded,xifengchuo/openembedded,crystalfontz/openembedded,giobauermeister/openembedded,troth/oe-ts7xxx,JamesAng/oe,nx111/openembeded_openpli2.1_nx111,giobauermeister/openembedded,yyli/overo-oe,openpli-arm/openembedded,dave-billin/overo-ui-moos-auv,yyli/overo-oe,nx111/openembeded_openpli2.1_nx111,sledz/oe,troth/oe-ts7xxx,openpli-arm/openembedded,xifengchuo/openembedded,JamesAng/goe,buglabs/oe-buglabs,sentient-energy/emsw-oe-mirror,nvl1109/openembeded,nvl1109/openembeded,nvl1109/openembeded,giobauermeister/openembedded,nvl1109/openembeded,sampov2/audio-openembedded,trini/openembedded,JamesAng/goe,sampov2/audio-openembedded,Martix/Eonos,rascalmicro/openembedded-rascal,demsey/openembedded,openembedded/openembedded,sampov2/audio-openembedded,JamesAng/oe,bticino/openembedded,sutajiokousagi/openembedded,crystalfontz/openembedded,giobauermeister/openembedded,philb/pbcl-oe-2010,sutajiokousagi/openembedded,bticino/openembedded,hulifox008/openembedded,John-NY/overo-oe,nzjrs/overo-openembedded,JamesAng/oe,hulifox008/openembedded,philb/pbcl-oe-2010,SIFTeam/openembedded,philb/pbcl-oe-2010,yyli/overo-oe,libo/openembedded,popazerty/openembedded-cuberevo