BUGFIX: fix an incorrect automatic merge from bk.
drwxr-xr-x - bin
drwxr-xr-x - doc