Merge commit '2e0d7a54b0b0488520baaef7782591fd90fd7a80' into stable
authorJiri Slaby <jslaby@suse.cz>
Thu, 14 Mar 2013 19:33:31 +0000 (20:33 +0100)
committerJiri Slaby <jslaby@suse.cz>
Thu, 14 Mar 2013 19:33:31 +0000 (20:33 +0100)
commite51e3da0e1955d7f91bab45fa01b291bd94b99d1
tree43285b3e049522ca19ada2b055bcb9e6d2e99fb3
parentf3f64cb4786fd567eb9005e2565ad8d000c0c138
parent2e0d7a54b0b0488520baaef7782591fd90fd7a80
Merge commit '2e0d7a54b0b0488520baaef7782591fd90fd7a80' into stable