Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

Conflicts:
	examples/declarative/states/states.qml
	examples/declarative/states/transitions.qml
	examples/declarative/tutorials/helloworld/t3/tutorial3.qml
	src/declarative/util/qmlanimation.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index bf40d2d..ae28ef1 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -24,7 +24,7 @@ Rect {
             Transition {
                 fromState: "*"
                 toState: "*"
-                NumericAnimation {
+                NumberAnimation {
                     properties: "opacity"
                     duration: 400
                 }