[oe-commits] Angus Ainslie : Merge branch 'fso/milestone5.5' of git at git.openembedded.org :openembedded into fso/milestone5.5

[git version control]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: 2ca00ebd2560c17342e6b628af7e5c8e9108c229
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2ca00ebd2560c17342e6b628af7e5c8e9108c229

Author: Angus Ainslie <nytowl at openmoko.org>
Date:   Thu Jul  9 07:50:10 2009 -0600

Merge branch 'fso/milestone5.5' of git at git.openembedded.org:openembedded into fso/milestone5.5

Conflicts:
	conf/distro/include/sane-srcrevs-fso.inc

---