Merge branch 'master' of git://repo.or.cz/factor/jcg

Conflicts:

	basis/cocoa/messages/messages.factor

diff --cc basis/cocoa/messages/messages.factor
index 09601ef8cc739af0a6c3d6afb293815c7b530993,3d7e1bfd84c1512ca1e1b3c14c0c46377391838a..3d7e1bfd84c1512ca1e1b3c14c0c46377391838a
mode 100644,100755..100644
--- 1/basis/cocoa/messages/messages.factor
--- 2/basis/cocoa/messages/messages.factor
+++ b/basis/cocoa/messages/messages.factor

diff --cc basis/cocoa/subclassing/subclassing.factor
index 3f8e709df0e779dc0d88855aba3177feb0329b0a,fd18c7fa89d738e07c95d3831fd8b238e8e0f6a4..fd18c7fa89d738e07c95d3831fd8b238e8e0f6a4
mode 100644,100755..100644
--- 1/basis/cocoa/subclassing/subclassing.factor
--- 2/basis/cocoa/subclassing/subclassing.factor
+++ b/basis/cocoa/subclassing/subclassing.factor

diff --cc basis/ui/cocoa/views/views.factor
index 45ab8ac0ce26b4cf0edf7a1dda3702d5e462386e,c6942a815836b282d727a202014bcb28552f6157..c6942a815836b282d727a202014bcb28552f6157
mode 100644,100755..100644
--- 1/basis/ui/cocoa/views/views.factor
--- 2/basis/ui/cocoa/views/views.factor
+++ b/basis/ui/cocoa/views/views.factor