Merged r2250 and r2251 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2252 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/unit/time_entry_test.rb

@@ -24,6 +24,7 @@ class TimeEntryTest < Test::Unit::TestCase
     assertions = { "2"      => 2.0,
                    "21.1"   => 21.1,
                    "2,1"    => 2.1,
+                   "1,5h"   => 1.5,
                    "7:12"   => 7.2,
                    "10h"    => 10.0,
                    "10 h"   => 10.0,
@@ -40,7 +41,7 @@ class TimeEntryTest < Test::Unit::TestCase
     
     assertions.each do |k, v|
       t = TimeEntry.new(:hours => k)
-      assert_equal v, t.hours
+      assert_equal v, t.hours, "Converting #{k} failed:"
     end
   end
 end