Merge branch 'adrian' into org.openembedded.dev
authorStefan Schmidt <stefan@datenfreihafen.org>
Mon, 24 May 2010 19:34:25 +0000 (21:34 +0200)
committerStefan Schmidt <stefan@datenfreihafen.org>
Mon, 24 May 2010 19:34:25 +0000 (21:34 +0200)

Trivial merge