Merge branch 'shr/merge' of ssh+git://git@git.openembedded.net/openembedded into...
authorSebastian Spaeth <Sebastian@SSpaeth.de>
Fri, 13 Nov 2009 13:50:54 +0000 (14:50 +0100)
committerSebastian Spaeth <Sebastian@SSpaeth.de>
Fri, 13 Nov 2009 13:50:54 +0000 (14:50 +0100)

Trivial merge