Merge commit '8f91af5' into stable
authorJiri Slaby <jslaby@suse.cz>
Mon, 4 Feb 2013 16:12:34 +0000 (17:12 +0100)
committerJiri Slaby <jslaby@suse.cz>
Mon, 4 Feb 2013 16:12:34 +0000 (17:12 +0100)
commit916f241e117df0070f2fa51713f59451c8484bb6
tree8f43038de6ea79f111300f98b8f876b681664094
parent4a1b9ba0c3faf726e54574a5754e13b07c50ea95
parent8f91af5a91869644a4bd27c2b9c5e5fde5205ad2
Merge commit '8f91af5' into stable