Merge branch 'master' into backgroud_patches_bnc550934
authorLadislav Slezak <lslezak@novell.com>
Mon, 23 Nov 2009 13:34:56 +0000 (14:34 +0100)
committerLadislav Slezak <lslezak@novell.com>
Mon, 23 Nov 2009 13:34:56 +0000 (14:34 +0100)
commit993c135c66322d639c3b78618c2c432ee2649440
tree3159d7d156af870edcae0af04252b5c52fef40ae
parentcc051f0623084f15d4640aa55d0f692d830213a5
parent0287f9b04dbdd853579ae4703554b41151f47d5f
Merge branch 'master' into backgroud_patches_bnc550934