Merge commit 'be27338a526d475a97d5d231e6c41f8f9c79757e'
authorJiri Slaby <jslaby@suse.cz>
Mon, 19 Mar 2012 10:06:12 +0000 (11:06 +0100)
committerJiri Slaby <jslaby@suse.cz>
Mon, 19 Mar 2012 10:06:12 +0000 (11:06 +0100)
commitf22be3960befe8d0f6a694311b71b569af75fa6b
treeeb3f550faf01f3d403923edb6343def83d5487d6
parenta9ab64aebbe2d78e7caa24e67d61943e6e44d3e1
parentbe27338a526d475a97d5d231e6c41f8f9c79757e
Merge commit 'be27338a526d475a97d5d231e6c41f8f9c79757e'