Merge changes made to SLE11 to be included in trunk

Merge remote branch 'origin/SuSE-SLE-11-SP2-Branch'

Conflicts:
	CMakeLists.txt
	libzypp-bindings.spec.cmake
	package/libzypp-bindings.changes

diff --cc swig/Callbacks.i
index 9a91ddb,e66bd0f..1c5e83c
--- 1/swig/Callbacks.i
--- 2/swig/Callbacks.i
+++ b/swig/Callbacks.i
@@@ -34,8 -34,9 +34,10 @@@ static Target_Type action_abort(
      if (value == Qnil)
        value = ID2SYM(rb_intern("abort"));
      return value;
+ #else
+   return Target_String("abort");
  #endif
 +    return 0; // fallback
    }
  
  static Target_Type action_retry()
@@@ -45,8 -46,9 +47,10 @@@
      if (value == Qnil)
        value = ID2SYM(rb_intern("retry"));
      return value;
+ #else
+   return Target_String("retry");
  #endif
 +    return 0; // fallback
    }
  
  static Target_Type action_ignore()
@@@ -56,8 -58,9 +60,10 @@@
      if (value == Qnil)
        value = ID2SYM(rb_intern("ignore"));
      return value;
+ #else
+   return Target_String("ignore");
  #endif
 +    return 0; // fallback
    }
  
  /*
@@@ -73,11 -76,9 +79,10 @@@ static Target_Type error_no_error(
      if (value == Qnil)
        value = ID2SYM(rb_intern("no_error"));
      return value;
- #endif
- #if defined(SWIGPYTHON)
+ #else
    return Target_String("no_error");
  #endif
 +    return 0; // fallback
    }
  
  static Target_Type error_not_found()
@@@ -87,11 -88,9 +92,10 @@@
      if (value == Qnil)
        value = ID2SYM(rb_intern("not_found"));
      return value;
- #endif
- #if defined(SWIGPYTHON)
+ #else
    return Target_String("not_found");
  #endif
 +    return 0; // fallback
    }
  
  static Target_Type error_io()
@@@ -101,11 -100,9 +105,10 @@@
      if (value == Qnil)
        value = ID2SYM(rb_intern("io"));
      return value;
- #endif
- #if defined(SWIGPYTHON)
+ #else
    return Target_String("io");
  #endif
 +    return 0; // fallback
    }
  
  static Target_Type error_invalid()
@@@ -115,11 -112,9 +118,10 @@@
      if (value == Qnil)
        value = ID2SYM(rb_intern("invalid"));
      return value;
- #endif
- #if defined(SWIGPYTHON)
+ #else
    return Target_String("invalid");
  #endif
 +    return 0; // fallback
    }
  
  /*