Merge commit 'c6b8d60' into stable
authorJiri Slaby <jslaby@suse.cz>
Sun, 17 Feb 2013 23:09:22 +0000 (00:09 +0100)
committerJiri Slaby <jslaby@suse.cz>
Sun, 17 Feb 2013 23:09:22 +0000 (00:09 +0100)
commitae1c506083953e8aeb49533b0a9c79fa9c3ffcec
tree882667af5d90f2e67cd30e10f2a572d6d056d2e6
parent2fa96bd51718a06667cf23f3a71fa20a4df068cb
parentc6b8d60501f5032b3d4525c1b85971ecbf8fb501
Merge commit 'c6b8d60' into stable