Merge commit '2a321c4d9e25f74d61bc76b692b780e8ce77fd84' into stable
authorJiri Slaby <jslaby@suse.cz>
Wed, 10 Oct 2012 19:28:57 +0000 (21:28 +0200)
committerJiri Slaby <jslaby@suse.cz>
Wed, 10 Oct 2012 19:28:57 +0000 (21:28 +0200)
commitef77ac5cee2f350ba22b9cf8c522a2d6e20f4dc7
treee4d19185b71cd91cf6a0d71afef0e60e6bc8b44a
parent34661a76531c31acdffbdf97e3a3fc6292d80cb9
parent2a321c4d9e25f74d61bc76b692b780e8ce77fd84
Merge commit '2a321c4d9e25f74d61bc76b692b780e8ce77fd84' into stable
series.conf