[oe-commits] Andreas Monzner : Merge branch 'org.openembedded.dreambox' of git://git. openembedded.net/openembedded into org.openembedded.dreambox

[GIT User account]

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

Author: Andreas Monzner <ghost at opendreambox.org>
Date:   Thu Mar 12 09:18:45 2009 +0100

Merge branch 'org.openembedded.dreambox' of git://git.openembedded.net/openembedded into org.openembedded.dreambox

Conflicts:

	packages/vsftpd/vsftpd_2.0.5.bb

---