merge of '1fa25c4ed2c76f537724929745c0f65656880cc7'      and 'afcc206a6c21cda5ace989e895b14a6d341a213e'
merge of '1fa25c4ed2c76f537724929745c0f65656880cc7'
     and 'afcc206a6c21cda5ace989e895b14a6d341a213e'

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