Merge commit 'jedediah/master'

* commit 'jedediah/master':
  Ruby 1.9 fixes

Conflicts:
	.gitignore

lib/dbus/auth.rb

@@ -30,7 +30,7 @@ def authenticate
       # obtain for "1000" => 31303030 This is what the server is expecting.
       # Why? I dunno. How did I come to that conclusion? by looking at rbus
       # code. I have no idea how he found that out.
-      return Process.uid.to_s.split(//).collect { |a| "%x" % a[0] }.join
+      return Process.uid.to_s.split(//).collect { |a| "%x" % a[0].ord }.join
     end
   end
 

lib/dbus/marshall.rb

@@ -109,7 +109,7 @@ def get_string
       ret = @buffy.slice(@idx, str_sz)
       raise IncompleteBufferException if @idx + str_sz + 1 > @buffy.size
       @idx += str_sz
-      if @buffy[@idx] != 0
+      if @buffy[@idx].ord != 0
         raise InvalidPacketException, "String is not nul-terminated"
       end
       @idx += 1
@@ -124,7 +124,7 @@ def get_signature
       ret = @buffy.slice(@idx, str_sz)
       raise IncompleteBufferException if @idx + str_sz + 1 >= @buffy.size
       @idx += str_sz
-      if @buffy[@idx] != 0
+      if @buffy[@idx].ord != 0
         raise InvalidPacketException, "Type is not nul-terminated"
       end
       @idx += 1