Merge branch 'master' of http://exfat.googlecode.com/svn/trunk/ into lollipop-x86

Conflicts:
	mkfs/cbm.c

diff --cc fsck/main.c
Simple merge

diff --cc fuse/main.c
Simple merge

diff --cc libexfat/compiler.h
Simple merge

diff --cc libexfat/exfat.h
Simple merge

diff --cc libexfat/io.c
Simple merge

diff --cc libexfat/log.c
Simple merge

diff --cc libexfat/platform.h
Simple merge

diff --cc mkfs/cbm.c
index 7f22a8c,e30928c..951637c
--- 1/mkfs/cbm.c
--- 2/mkfs/cbm.c
+++ b/mkfs/cbm.c
@@@ -24,7 -26,6 +24,8 @@@
  #include "fat.h"
  #include "uct.h"
  #include "rootdir.h"
 +#include <limits.h>
++#include <string.h>
  
  static off_t cbm_alignment(void)
  {

diff --cc mkfs/fat.c
Simple merge

diff --cc mkfs/main.c
Simple merge

diff --cc mkfs/mkexfat.c
Simple merge

diff --cc mkfs/rootdir.c
Simple merge

diff --cc mkfs/vbr.c
Simple merge