Merge commit 'ecd48c7' into stable
authorJiri Slaby <jslaby@suse.cz>
Tue, 5 Feb 2013 15:27:05 +0000 (16:27 +0100)
committerJiri Slaby <jslaby@suse.cz>
Tue, 5 Feb 2013 15:27:05 +0000 (16:27 +0100)
commitd5cefdd8eccaa8ce0ad6adf678a41673385e977c
tree826add4e4aba60b4039e384d8171905357e2d7b8
parent916f241e117df0070f2fa51713f59451c8484bb6
parentecd48c7af399ea4ae680a39bf5e7568664374469
Merge commit 'ecd48c7' into stable