Merge commit '7f4460eadba3919a1515663dab321c9ae9dbe4ba' into stable
authorJiri Slaby <jslaby@suse.cz>
Mon, 21 Jan 2013 23:45:13 +0000 (00:45 +0100)
committerJiri Slaby <jslaby@suse.cz>
Mon, 21 Jan 2013 23:45:13 +0000 (00:45 +0100)
commita453656d70cf01dac1ec44a32046f729c83b1151
tree514bd94ab45c6061ff2b4dc27ca16140c3add47f
parent8eb6368eff58747df68d4b0e69bf5cc2d57c7e7c
parent7f4460eadba3919a1515663dab321c9ae9dbe4ba
Merge commit '7f4460eadba3919a1515663dab321c9ae9dbe4ba' into stable