initial commit from bzr repo
	new file:   .dep.inc
	new file:   .gitignore
Merge remote-tracking branch 'github/master'

Conflicts:
	FFJSON.cpp
	FFJSON.h
	Makefile
	mycurl.h
	mystdlib.h
	myxml.h
	nbproject/Makefile-DebugDynamic.mk
	nbproject/Makefile-DebugStatic.mk
	nbproject/Makefile-armhfDebugDynamic.mk
	nbproject/configurations.xml
	nbproject/private/configurations.xml
	nbproject/private/private.xml