Merge branch 'toba'
commitd52be5549c61a3098988b19f118afd4d8ea94787
authorMichal Čihař <mcihar@novell.com>
Mon, 7 Feb 2011 14:51:19 +0000 (7 15:51 +0100)
committerMichal Čihař <mcihar@novell.com>
Mon, 7 Feb 2011 14:51:19 +0000 (7 15:51 +0100)
tree3d706cef21506998e89bdbac9cf741c5c4b9f727
parentc809b67c412253abebdec82bceccaadf6fbd6ae5
parentbfe37a58a5cc0c0dc8b6620016ac633e35e2110c
Merge branch 'toba'