Merge commit 'opendreambox/opendreambox-1.6' into vuplus-1.6
[vuplus_openembedded] / recipes / proftpd / proftpd_1.3.2b.bb
2010-02-11 ghostmerge with org.openembedded.dev