[oe-commits] Holger Hans Peter Freyther : Merge branch 'org.openembedded.dev' of git+ssh ://git at git.openembedded.net/openembedded into org.openembedded.dev

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: f0573933b8de671b98e3d5377774c6a3e671fc84
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f0573933b8de671b98e3d5377774c6a3e671fc84

Author: Holger Hans Peter Freyther <zecke at selfish.org>
Date:   Mon Nov  3 16:35:01 2008 +0100

Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.net/openembedded into org.openembedded.dev

Conflicts:

	packages/images/fso-image.bb

---