From 007366ced17249cf3dc1e55318cc4db6bb1bbe15 Mon Sep 17 00:00:00 2001
From: Erik Schoster <erik@heythere.org>
Date: Mon, 20 Feb 2012 00:46:26 -0600
Subject: [PATCH] fake merge core fixes from haiku

---
 fabric/fabric.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fabric/fabric.py b/fabric/fabric.py
index d53925b..3af7e6a 100644
--- a/fabric/fabric.py
+++ b/fabric/fabric.py
@@ -453,10 +453,14 @@ def iscrossing(first, second):
         first = struct.unpack("<h", first) 
         second = struct.unpack("<h", second) 
 
-        if first[0] >= 0 and second[0] <= 0:
+        if first[0] > 0 and second[0] < 0:
             return True
-        elif first[0] <= 0 and second[0] >= 0:
+        elif first[0] < 0 and second[0] > 0:
             return True
+        elif first[0] == 0 and second[0] != 0:
+            return False 
+        elif first[0] != 0 and second[0] == 0:
+            return True 
 
     return False