Merge commit '78f2edcdcef98d8e3f2aceff763f9e0a34ae77ae' into stable
authorJiri Slaby <jslaby@suse.cz>
Thu, 9 Aug 2012 16:12:01 +0000 (18:12 +0200)
committerJiri Slaby <jslaby@suse.cz>
Thu, 9 Aug 2012 16:12:01 +0000 (18:12 +0200)
commited5f21b40a7b690c44102939e9f40d94681e6346
treeaaf183349534efc73daf538db599dfc369eb3fb0
parent954867fb9b718c7f57c565f10f2a7cb206368bc5
parent78f2edcdcef98d8e3f2aceff763f9e0a34ae77ae
Merge commit '78f2edcdcef98d8e3f2aceff763f9e0a34ae77ae' into stable